Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	GhostHunter17/bin/GhostHunter17.apk
	GhostHunter17/bin/classes.dex
	GhostHunter17/bin/resources.ap_