Sozial, path von Elektrotechnik
Sozial, path von Elektrotechnik
Merge branch 'master' of https://github.com/Beware92/ProjectHTWAPP

Conflicts:
	HTW-App/bin/HTW-App.apk
	HTW-App/bin/classes.dex
	HTW-App/bin/classes/com/example/htw_app/R$id.class
	HTW-App/bin/resources.ap_