Temporary commit
Add Admin stuff
Merge branch 'master' into dev

Conflicts:
	server/src/at/ac/uibk/informatrix/ride4earth/data/util/HibernateUtil.java