Cache prepare
Cache prepare fix
Merge origin/develop into develop

Conflicts:
	protected/views/layouts/main.php
Merge origin/develop into develop

Conflicts:
	protected/views/layouts/main.php
Fixes in notifications