added PartnerFunction
Server fault stuff and partner stuff fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	daniel/app/src/main/java/com/graungaard/pvc_app/MainActivity.java