Temporary commit
Merge branch 'master' into dev
Fix connection persistence to api
Add new super entity, DAO and facade for it
Temporary commit
Merge branch 'master' into dev

Conflicts:
	server/src/at/ac/uibk/informatrix/ride4earth/logic/service/SupporterService.java
	server/src/at/ac/uibk/informatrix/ride4earth/logic/service/UserService.java