Merge branch 'ticket/238' into develop

James Moger

2015-02-26 3bddeebcebf197ed6f8f785b26fba02faebd5344

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