faq updated
Merge branch 'master' of https://github.com/themeforest/html-reactive

Conflicts:
	page-faq.php