Merge branch 'ticket/185' into develop

James Moger

2014-09-24 2fb843db2702f5f6d1df784d53dd6cbba286f4f3

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