clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	server-jar/src/main/java/org/project2action/dao/ProjectDao.java
	server-jar/src/main/java/org/project2action/resource/QueueResource.java