Added FAQ model
Merge branch 'stage' of https://github.com/stevemcquaid/boa into stage

Conflicts:
	config/routes.rb