Go home.
Merge branch 'master' of https://github.com/Austin-Xie/ServiceStatus

Conflicts:
	development/views/pages/service/status/list.php