update
Merge branch 'master' of https://github.com/Melan13/HamletHubWorking

Conflicts:
	phonegap5/bin/phonegap5.apk
	phonegap5/bin/resources.ap_