Change name of variable user in jsp.
Change names in edit and new selects.
Merge branch 'master' of github.com:osmman/project-control

Conflicts:
	src/main/webapp/WEB-INF/jsp/users/index.jsp