Merge branch 'ticket/142' into develop

James Moger

2014-09-04 8b1d0aed40b4fc3ed5b30aa824a4c2924b788454

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