Merge origin/master
Merge origin/master

Conflicts:
	www/templates/apps/home/posting_group.html
Merge origin/master

Conflicts:
	protected/modules/android/controllers/PostingController.php
Merge origin/master