Comment scroll
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/src/com/sims/topaz/CommentFragment.java
	android/src/com/sims/topaz/adapter/CommentAdapter.java