Merge pull request #31 from neon-ninja/master

Pull request #5
fix https://github.com/nesi/projectdb-webapp/issues/32
Merge branch 'master' of git@github.com:nesi/projectdb-webapp.git

Fix project reset

Conflicts:
	src/main/java/pm/controller/EditProjectController.java