Merge branch 'master' of https://github.com/Synthace/docs

Conflicts:
	resources/faq.md
Merge