Working on Elastic Search. Added BitmapJsonConverter and ElasticSearchOperations
Added comments to ElasticSearchOperations.java
added changing of favourites star colour
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into steven

Conflicts:
	Team10ProjectW2014/bin/Team10ProjectW2014.apk
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/controllersAndViews/SubCommentViewActivity.java