add register function
security fixes
resolution fix
Merge branch 'master' into dev

* master:
  resolution fix
  security fixes
  add register function

Conflicts:
	src/application/views/scripts/files/index.phtml