Merge branch 'ticket/118' into develop

James Moger

2014-06-27 9b89bf102d1fb2cb96ce96eec746a594e539125c

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