Merge branch 'ticket/134' into develop

James Moger

2014-09-08 0ff8437e4af58a4e75b42248610a486986acfa93

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