fixed
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	api/controllers/faq.js
Merge branch 'master' of https://github.com/ludwiksh/Marksimos

Conflicts:
	api/controllers/faq.js
update
update