Click-Through Prototype Complete
Merge branch 'master' of https://github.com/haroldtreen/BackTrack

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	ic_launcher-web.png
	libs/android-support-v4.jar
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/layout/activity_main.xml
	res/values/strings.xml