Delete local.php
master
Merge remote-tracking branch 'origin/master'
Delete workspace.xml
Delete macbookpro.xml
Delete scope_settings.xml
master
Merge remote-tracking branch 'origin/development'

Conflicts:
	pavelpigalev/protected/views/site/index.php
siteController to mainController
Delete application.log
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into development