Merge branch 'ticket/165' into develop

James Moger

2014-09-05 668a0d65fe393986c662a62f667204872582d93f

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