Initial commit
Merge remote-tracking branch 'upstream/master' into explore-conflict

Conflicts:
	views/faq.html
Fixed naming