small changes to layouts
projects and resourcesmodels and basic pages
Merge branch 'master' into frontend

Conflicts:
	app/views/layouts/header.blade.php
header navbar
Merge branch 'master' of https://github.com/knommon/knommon

Conflicts:
	app/views/layouts/header.blade.php
Merge branch 'frontend'

Conflicts:
	app/routes.php
	app/views/layouts/footer.blade.php
	app/views/layouts/header.blade.php
	package.json