New html version - Incomplete
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/css/app.css
	server/logic/objType.js