Made intents work for CC
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