...
Merge branch 'master' of ssh://github.com/colitman/Jervice-dev

Conflicts:
	war/WEB-INF/classes/.gitignore