Merge origin/master

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

Conflicts:
	protected/modules/android/controllers/PostingController.php