Adding support for html tags
Merge pull request #11 from vrockai/TAGS

Adding support for html tags
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/scripts/faqData.json