Merge branch 'master' of C:\Users\Christoph\AndroidStudioProjects\Ferienakademie2014Client with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/controller/ActiveChallengesAdapter.java
ActiveChallengesAdded
Merge remote-tracking branch 'origin/master'