Star rating
Message system
subscription
Merge branch 'master' of https://github.com/papyrus-project/papyrus

Conflicts:
	protected/controllers/SiteController.php