javadoc
Merge origin/master

Conflicts:
	src/main/java/com/itcs/commons/email/impl/JavaMailMessageParser.java