Part of updates - Queue, MainLayout
Merge remote-tracking branch 'origin/master'

Conflicts:
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/Content.java
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/MainActivity.java
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/Queue.java
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/Reply.java
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/User.java