front angular
xaxa
Merge branch 'frontend' of https://github.com/alexdevid/devid into dev

Conflicts:
	protected/config/main.php
	protected/views/layout.twig