finish FAQ - enhancement #186
Merge remote-tracking branch 'origin/develop' into develop-ja-demote-roles

Conflicts:
	app/views/faqs/show.html.erb