refs #29932
Merge branch 'master' of https://github.com/aipocom/aipo.git

Conflicts:
	portlets/webmail/src/main/webapp/WEB-INF/templates/vm/portlets/html/ajax-webmail-list.vm
	portlets/webmail/src/main/webapp/WEB-INF/templates/vm/portlets/html/ja/ajax-webmail-list.vm