stuff
Merge branch 'master' of https://github.com/rmm01/GauchoShout

Conflicts:
	src/com/gauchoshout/android/ui/CommentListAdapter.java