Merge branch 'ticket/140' into develop

James Moger

2014-09-04 9f4544301f8ce4016f8dd948d8bc9a754ff3e5da

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