Merge branch 'ticket/211' into develop

James Moger

2014-10-26 3faf6f6469759538590aa7f1012c543f95583c56

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