pull-1123
Merge branch 'master' of https://github.com/MZLTicket/inside_php

Conflicts:
	ticket/controllers/home.php
	ticket/views/home/login.php