added new models, fixed js, css concat
Merge branch 'master' of github.com:jcordova96/hnn

Conflicts:
	protected/views/layouts/hnn-main-1.php