Properties change for the new branch
Major changes to the models
Minor changes
Fixed default location and changing location + username
Added Refresh immediately and picturesort menu
Added reply to comments and view replies
Merge remote-tracking branch 'origin/master' into shawn

Conflicts:
	.classpath
	bin/Localpost.apk
	src/ca/cs/ualberta/localpost/controller/ElasticSearchOperations.java
	src/ca/cs/ualberta/localpost/model/UserModel.java
	src/ca/cs/ualberta/localpost/view/FreshestTabView.java
	src/ca/cs/ualberta/localpost/view/MainActivity.java
	src/ca/cs/ualberta/localpost/view/SubmitComment.java