changes to faqs and terms
merge faqs
Merge branch 'master' of https://github.com/Floppy/seedpod

Conflicts:
	app/views/pods/FAQ.html.erb
more mess with faqs
Merge branch 'master' of https://github.com/Floppy/seedpod