Profile edit
bootstrap rating
Merge branch 'master' of https://github.com/papyrus-project/papyrus

Conflicts:
	protected/controllers/UserController.php