fixed error in ESop
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/network/ElasticSearchOperations.java
Add method to delete comments by _id
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
Added maps classfile and XML as well as mapquest SDK .jar
Add timestamp string represention to CommentModel
Add String version of timestamp
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Removed mapquest SDK pointing to Brad's folder
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
Update delete comment mthod to accept androidID and timestamp_str only
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014
added elasticsearchoperation
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/network/ElasticSearchOperations.java
Added save location list
Fixed location list
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole