Upload
Merge branch 'master' of https://github.com/hkonline/Hallo

Conflicts:
	Hallo/Controllers/UserController.cs
	Hallo/Views/User/PmoInfo.cshtml
	Hallo/Views/User/PmoUpload.cshtml
	Hallo/Web.config