Before making testing branch.
Merge branch 'master' into front_end

Conflicts:
	src/com/stg/inqueue/MainActivity.java
Minor change