Started working on showing favourites and want to read comments
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
fixed replies disappearing.
Viewing favourited comments should now work.
Tried fixing sort by photo and tried fixing favouriting/unfavouriting comments from within favourite view
Nothing important.
Change to Theme.Holo (Dark)
Fix merge conflicts in strings.xml
Increase divider size to 3px
Change icon to speech ubble (Freeware License)
Merge branch 'master' into steven

Conflicts:
	Team10ProjectW2014/AndroidManifest.xml
	Team10ProjectW2014/bin/AndroidManifest.xml
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/models/ApplicationStateModel.java