Refactored String
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	FitFritz/app/src/main/java/ferienakademie/de/fitfritz/controller/DatabaseHandler.java