Added password for all default users.
Check on server for images!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/pages/home/test.jsp