controller: added height challenges
Merge branch 'master' of github.com:Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/controller/DatabaseHandler.java
Merge branch 'master' of github.com:Maddoc42/Ferienakademie2014Client