Merge branch 'hotfix/erjavamail_typo_fix'
Merge branch 'develop'
Merge branch 'master' of https://github.com/projectwonder/wonder
accepting merge changes from community master

Merge branch 'wocommunity_master'

Conflicts:
	Frameworks/Core/ERJavaMail/Sources/er/javamail/ERJavaMail.java
Merge branch 'master' into develop