Merge branch 'master' of Z:\home\way.local\www\App with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/frameworkRootSettings.xml
	protected/controllers/SiteController.php
	protected/views/layouts/main.php
	protected/views/site/preview.php
Merge branch 'master' of Z:\home\way.local\www\App with conflicts.
Rename Result On Preview