Worked on tests for CommentActivityTest
CommentModel JUnits written. CommentModel should work when everything is implemented, minus favourites.
Merge branch 'CustomListView' into dev
Merge branch 'dev' of https://github.com/CMPUT301W14T06/LARD into dev

Conflicts:
	LARD/bin/classes/ca/ualberta/lard/R$string.class
	LARD/bin/classes/ca/ualberta/lard/R$style.class
	LARD/gen/ca/ualberta/lard/R.java
	LARD/res/values/strings.xml