Customer controller
Merge branch 'master' of calxgit:FreackZoid/Flowr

Conflicts:
	src/main/java/ro/uaic/flowr/domain/Account.java
	src/main/webapp/js/myScript.js