Merge branch 'ticket/169' into develop

James Moger

2014-09-08 aa8708a66f854f206f0bddd174887728a888b630

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