asd
Fixed path issue.
Merge branch 'path-fix'

Conflicts:
	protected/runtime/application.log
	protected/views/layouts/main.php
	public/js/app.js.map