Misc
Merge branch 'master' of https://github.com/chinhdo/WebMonitor

Conflicts:
	src/main/java/chinhdo/mail/Gmail.java