update manifest and string files
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/AndroidManifest.xml
	nEVERrEST/app/src/main/res/values/strings.xml