added additionallifetime attribute to activity
test case for activities
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Shared

Conflicts:
	src/main/java/de/ferienakademie/neverrest/shared/beans/Activity.java