* Added FAQ.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	public/css/module.css