Revamp UI. Need to add new fragment to display line position.
Delete extra line.
Add position fragment.
Merge branch 'ui_development' of https://github.com/sk25649/inQueue into ui_development
Attempt to fix merge conflicts.
Fix merge errors.
Merge branch 'master' of https://github.com/sk25649/inQueue

Conflicts:
	gen/com/stg/inqueue/R.java
	res/values/strings.xml
	src/com/stg/inqueue/MainActivity.java
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
Fixed merge issue.