nothing important changed
Merge branch 'master' of https://github.com/fabiopk/android_project.git

Conflicts:
	Link - Ghost Hunter/bin/Link - Ghost Hunter.apk
	Link - Ghost Hunter/bin/classes.dex
Icon added to splashscreen