Rollback to fix merge conflicts
Merge branch 'master' of https://github.com/sk25649/inQueue

Conflicts:
	AndroidManifest.xml
	gen/com/stg/inqueue/R.java
	res/values/strings.xml
	src/com/stg/inqueue/MainActivity.java