Activity Tim
Merge branch 'master' of https://github.com/cmitz/Shoque

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/example/shoque/R$layout.class
	bin/classes/com/example/shoque/R$menu.class
	bin/classes/com/example/shoque/R$string.class
	gen/com/example/shoque/R.java
	res/values/strings.xml