bug: comments are being removed as soon as they are posted
Merge remote-tracking branch 'origin/luke' into pf_luke

Conflicts:
	res/drawable-hdpi/icon.png