commit before m
Merge commit '035a57e5ba2d0d8b8981d46a73f65347d88b4976'

Conflicts:
	protected/runtime/application.log
	themes/hebo/views/user/view.php