merge files with others but still can not run. Pull to each local machine and investigate
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/axonactive/win3/controllers/LoginController.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/axonactive/win3/controllers/MailSenderTest.java