resolve conflict
resolve conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hid/target/classes/hid/controller/AdminController.class