added a couple of faqs
updates
update
Merge branch 'master' of https://github.com/exterminate/cite

Conflicts:
	classes/DB.php
	dashboard.php
	layout/style.css