Merge branch 'ticket/115' into develop

James Moger

2014-06-27 5b41f21c57274c4f2e58b78dcb8666d0b37dc6d2

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