Merge branch 'master' of http://github.com/togeez/togeez

Conflicts:
	togeez-webapp/src/main/webapp/resource/css/togeez.css