stuff not working, might revert.
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
merged with master
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
fixed error in ESop
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/network/ElasticSearchOperations.java
Attempt at fixing list view scrolling problem
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Add method to delete comments by _id
Fixed my problem with not pulling from elasticsearch
Merge branch 'Cole' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Fixed photo disappearing issue in Create comment
Merge branch 'steven'
Added comments to tell Steve where to load & save locationModels