t
Merge branch 'master' of https://github.com/ahoedle/web_examples

Conflicts:
	.DS_Store
	Yii/.DS_Store
	Yii/cms/protected/runtime/application.log