Removed redundant code from MainListViewActivity
Merge branch 'Costa'
Add Serializable to LocationModel and remove extra ArrayList in SubCommentModel
Made intents work for CC
Added adapter in mainlistviewactivty; commented out location in mainlistviewactivity adapter
Merge branch 'Costa'

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/MainListViewActivity.java
Fix display of comments in MainListViewActivity
Fix username when creating a comment
Various changes
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014

Conflicts:
	Team10ProjectW2014/src/ca/ualberta/team10projectw2014/MainListViewActivity.java
fdfsd
Fixed my merge screwup
Added minutes into MainListViewAdapter
Added space between username and location in head comment list
Changed the way username is formatted for anon users
Merge branch 'bradley'
Added skeleton code for a potential confirmation dialog box in CC
Merge branch 'bradley'
Added camera functionality to CC with small icons
Attempted to make images from CC save to file so that they can be used by other activities