java mail init
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/sql/mysql/schema.sql
	src/main/webapp/WEB-INF/views/admin/userForm.jsp