Merge branch 'master' of https://github.com/kashankhan/TUM_IDP_Companion

Conflicts:
	TUM_IDP_Companion/TUM_IDP_Companion/Classes/Backend/DAL/ContactsDAL.h
	TUM_IDP_Companion/TUM_IDP_Companion/Classes/Backend/DAL/ContactsDAL.m
	TUM_IDP_Companion/TUM_IDP_Companion/de.lproj/Localizable.strings
	TUM_IDP_Companion/TUM_IDP_Companion/en.lproj/Localizable.strings