for merge
Merge branch 'master' of ssh://github.com/colitman/InTouch

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