sdfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hid/src/main/java/hid/controller/AdminController.java