Merge remote-tracking branch 'origin/chao_portal' into admissions

Conflicts:
	includes/connection_nanshan.php
	includes/connection_shekou.php
	includes/constants.php
	includes/footer.php
	includes/functions.php
	includes/header.php
	includes/sessions.php
	index.php
	login.php
	process/login_process.php
	process/register_process.php
	test.php

jan_27 Portfolio in Beta 4 && Signin 1.0