Merge with upstream master branch.
Merge branch 'master' of https://github.com/CMPUT301W14T3/Group-Project

Conflicts:
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2$1.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$2.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$3.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter$4.class
	bin/classes/cs/ualberta/ca/tunein/CommentViewAdapter.class
	src/cs/ualberta/ca/tunein/CommentViewAdapter.java