added tls support
added faq and press pages
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
	server.js
	server/lib/router.js
Merge remote-tracking branch 'origin/master'
adding faq and press