pull
Merge branch 'master' of https://github.com/Beware92/ProjectHTWAPP

Conflicts:
	HTW-App/bin/HTW-App.apk
	HTW-App/bin/classes.dex
RSS package