no message
Merge branch 'master' of https://github.com/daohashi/ticketer

Conflicts:
	application/views/home/owner.php
akjsndka
Merge branch 'master' of https://github.com/daohashi/ticketer