fixing directories structure.
Merge branch 'master' of https://github.com/leroyakg/Manager

Conflicts:
	less/media-queries.less
	protected/views/layouts/main.php
	public/css/app.css
	public/css/app.css.map