commit to fetch
commit to pull
Merge branch 'master' of https://github.com/djfried/Silencio

Conflicts:
	Silencio/bin/Silencio.apk
	Silencio/bin/classes.dex
	Silencio/bin/classes/dougfrieders/blogspot/silencio/MainActivity.class
	Silencio/bin/jarlist.cache
	Silencio/bin/resources.ap_
	Silencio/project.properties