Delete macbookpro.xml
Delete scope_settings.xml
Delete workspace.xml
development
index config choosing
config & migrations
Merge remote-tracking branch 'origin/development'

Conflicts:
	pavelpigalev/protected/views/site/index.php