- fonts added
- removed error generating files
fix- footer styles
Revert "add layout.php (empty test)"

This reverts commit e09657711dac9edc4759ac9f74d25788173f1917.
Revert "Revert "add layout.php (empty test)""

This reverts commit 90790b33fcbf04816a31b459530bef5162fbb28e.
improved rendering of navigation
Merge branch 'master' of github.com:85nomar/psychic-cyril
Merge branch 'master' into edi
update nobel files
re-add bootstrap
fixed font errors
Merge branch 'master' into edi
fixed issue with formnav controller
Merge branch 'master' of github.com:85nomar/psychic-cyril

Conflicts:
	css/ric_default.css
	inc/formnav.php
	inc/head.php
	inc/layout.php
Merge branch 'master' into edi