Merge branch 'ticket/137' into develop

James Moger

2014-07-05 34d7d04aa8a1a7706be333f5eb0a4aec7f066850

1
2
3
[submodule "src/main/distrib/data/gitignore"]
    path = src/main/distrib/data/gitignore
    url = https://github.com/github/gitignore.git