fixed incorrect link
Merge remote-tracking branch 'upstream/dev'
updating FAQ language and some stray text updates
fixed hackday sendto links
fucking up shit from Erikas merge