change text in AboutFaithActivity; change ordering of 'if-else'-instructions in BaseRequestListener
Merge branch 'master' of https://github.com/SE2Prj-FAITH/FAITH-AndroidApp

Conflicts:
	src/ch/hsr/faith/android/app/activities/listeners/BaseRequestListener.java
resolve merge conflicts to commit: AboutFaithActivity text changes and BaseRequestListener ordering of if-else