Merge newup_portal_dev/master into local

Conflicts:
	home/classes/authorization/Authorization.class.php
Merge local into local_2

Conflicts:
	home/classes/authorization/Authorization.class.php