Message requesting
Merge branch 'master' of http://github.com/bagedevimo/email

Conflicts:
	IMAP.js
Merge branch 'master' of http://github.com/bagedevimo/email