Merge branch 'ticket/242' into develop

James Moger

2015-02-26 b0c67c0db4b21da069e1c038542afc1764c816b0

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