update: user account enhenced
Merge branch 'master' of https://github.com/capensis/canopsis-webcore
better data upload format
Merge branch 'master' of https://github.com/capensis/canopsis-webcore

Conflicts:
	var/www/canopsis/core/controller/application.js