different favourite implementation
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project

Conflicts:
	GeoComment/res/layout/comment_row.xml
	GeoComment/src/com/example/geocomment/GeoCommentActivity.java
different favourite