progress
siga
merges
Merge branch 'master' into sergiu

Conflicts:
	webapps/ROOT/accountCreated.jsp