fixed error in ESop
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/network/ElasticSearchOperations.java
Fixed photo disappearing issue in Create comment
Merge branch 'steven'