Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/example/phr/daoimpl/UserDaoImpl.class
	bin/classes/com/example/phr/local_db/DatabaseHandler.class