Temporary commit
Temporary commit
Merge branch 'master' into dev

Conflicts:
	server/src/at/ac/uibk/informatrix/ride4earth/data/entities/CommunityUserImpl.java
	server/src/at/ac/uibk/informatrix/ride4earth/data/entities/SupporterImpl.java
	server/src/at/ac/uibk/informatrix/ride4earth/global/interfaces/Supporter.java
Temporary Commit
Merge branch 'master' into dev

Conflicts:
	server/src/at/ac/uibk/informatrix/ride4earth/data/dao/common/AbstractHibernateDao.java
	server/src/at/ac/uibk/informatrix/ride4earth/data/dao/implementation/CommunityUserDaoImpl.java
	server/src/at/ac/uibk/informatrix/ride4earth/data/facade/UserFacade.java
	server/src/at/ac/uibk/informatrix/ride4earth/data/facade/implementation/SupporterFacadeImpl.java
	server/src/at/ac/uibk/informatrix/ride4earth/data/facade/implementation/UserFacadeImpl.java