Merge origin/master

Conflicts:
	web/portal.jsp
Merge origin/master
Merge origin/master

Conflicts:
	web/portal.jsp
Merge origin/master