working to migrate to new asset management
Merge branch 'master' of https://github.com/philippfrenzel/yiimetroui

Conflicts:
	yiimetroui/assets.php