machine administration
Merge branch 'master' of https://github.com/ruzovvo/Laundry

Conflicts:
	WebContent/WEB-INF/jsp/admin/machine/add.jsp
	src/main/java/com/mipt/dcam/laundry/controller/AdminController.java