some little changes
resolve conflicts
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	evilMAIL-root/evilMAIL-web/src/main/java/pl/stasienko/evilMAIL/web/EvilMAIL.java