Merge branch 'master' of github.com:Collabforge/META-front

Conflicts:
	db/lifelust_meta.sql
Merge commit
Fixed db dump merge
movedfonts and updated
Added header logo
updated body font
updated body font to frutiger
update to frutiger proper
Updated .gitignore
sansation font and darkgray added
Added Open Sans font
added new custom page
gitignore
Merge branch 'master' of github.com:Collabforge/META-front
font size and style for top nav
Deleted generated css files
update page type
Front page update
Changed top menu look
Finalise about page and update of page theme including sidebar