.
Merge remote-tracking branch 'origin/0.0.1-dev' into 0.0.1-dev

Conflicts:
	src/main/java/com/quasar/core/entity/Problem.java
	src/main/java/com/quasar/core/entity/Rate.java
	src/test/java/com/quasar/core/TestUtils.java
	src/test/java/com/quasar/core/dao/AttributeKeywordDaoTest.java
	src/test/java/com/quasar/core/dao/UserDaoTest.java
	src/test/java/com/quasar/test/utils/TestUtils.java
.