Added getProjectAllocations
Modified projectallocation object
Added getAllProjectAllcations Rest
Merge branch 'develop' into allocs

Conflicts:
	src/main/java/pm/db/IBatisProjectDao.java
	src/main/java/pm/db/ProjectDao.java
Added spring security config.
Changing default location of users file to /etc/projectdb.users.conf
Merge branch 'spring-security' into develop
Updated getProjectAllocationByProjectCode
Added CreateProjectAllocation
Updated getprojectAllocationbyProjectCode to retrieve list.
status validation
Refactored getProjectAllocations and createProjectAllocation into Projectcontrol and ProjectController
DOI support for research outputs
disable csrf check
Override annotation
Remove csrf disable again
Trying to fix basic auth
Fixing basic auth, again
Disable csrf
basic auth
Merge branch 'develop' of git@github.com:nesi/projectdb-webapp.git into develop
reset project cache on research output upsert