Merge branch 'master' into dev

Conflicts:
	server/src/at/ac/uibk/informatrix/ride4earth/data/hibernate/entities/SupporterImpl.java
Merge branch 'master' into dev