ll
Merge branch 'master' of https://github.com/VikingOrg/viking.git

Conflicts:
	src/main/webapp/WEB-INF/jsp/machineModelEdit.jsp