Merge branch 'ticket/221' into develop

James Moger

2014-11-10 8cd4feca58b55f311a543c744777e930c4f4b34a

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