created sort by date
deleted location sorting options
fixed username in browesecommentactivity
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project
comment fixes
adapter notifychange error checking
edit comments
Merge branch 'Fixes'
before pull
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project
resize image
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project

Conflicts:
	GeoComment/src/com/example/geocomment/GeoCommentActivity.java
cleaner version
clearner
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project
change location in create comment + icon for reply, and change location
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
Added OOD so you guys can fix UML diagrams