more changes
Merge branch 'master' of https://github.com/bengovernment/Tripwire

Conflicts:
	bin/TripWire.apk
	bin/classes.dex
	bin/classes/com/fooinc/tripwire/SplashActivity.class
	bin/resources.ap_