Log IP, MAC
Merge branch 'master' of https://github.com/superleo-cn/pos

Conflicts:
	app/controllers/Auth.java