Merge branch 'ticket/135' into develop

James Moger

2014-09-26 aaa4e8f82711fe228500393b1a3dd5f3f0d78911

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