Update FAQ text changes

From 0e6d9bd12580eab1b936118bfae8eb82ddfb73f2
Move link to relevant text instead of "here"
Remove static links
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	website/faq.php