layout
Merge branch 'master' of https://github.com/EvolutionWebStudio/test

Conflicts:
	protected/views/layouts/main.php