fixed page faq.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/database.sqlite
	core/media/js/open-hide.js
	core/templates/faq.html
added blog zinnia
zinnia in progress
zinnia in progress
zinnia in progress
zinnia in progress
zinnia in progress
zinnia in progress....
zinnia in progress....
zinnia in progress....
zinnia in progress....
zinnia in progress....
zinnia in progress....
Merge pull request #15 from alexzaporozhets/zinnia

Zinnia