Added commented out test for future elastic search testing in MainListViewActivityTests
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Costa

Conflicts:
	Team10ProjectW2014/bin/Team10ProjectW2014.apk
Fixed issue with testing sort by location in MainListViewActivity