Working on bug where added comments do not appear until refresh.
fixed locations sorting so that locations are loaded when location radio button is clicked.
added function to the refresh button
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/controllersAndViews/SubCommentViewActivity.java
Joining threads when dealing with elasticsearch
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Working on displaying subsub