fixed error in ESops
changed url to a working testing one
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/network/ElasticSearchOperations.java