Merge remote-tracking branch 'origin/master'

Conflicts:
	instastalker-persistence/src/main/java/com/ap/instastalker/persistence/dao/JpaUserDao.java
	instastalker-persistence/src/test/resources/database.test.properties