Project Properties
Merge branch 'master' into rest-refactoring

Conflicts:
	src/main/java/pm/db/IBatisProjectDao.java
	src/main/java/pm/db/ProjectDao.java
	src/main/resources/ibatis_queries.xml
mybatis syntax for new prop methods