Merge branch 'ticket/204' into develop

James Moger

2014-10-10 461d90d607492d1b18ad8fa1e8a9984b2dc423f5

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