Admin User Info
Merge branch 'master' of https://github.com/thammasart/hip

Conflicts:
	app/controllers/Admin.java