pasando less
Merge branch 'master' of https://github.com/leroyakg/Manager

Conflicts:
	protected/views/layouts/main.php
Merge branch 'master' of https://github.com/leroyakg/Manager

Conflicts:
	public/css/app.css.map