- Update for faq & faq category.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
Merge branch 'develop' of github.com:quangthi90/SongNguyen into feature/trello_15
 - Update for faq.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
fixed faq
Merge branch 'develop' of github.com:quangthi90/SongNguyen into feature/trello_15

Conflicts:
	catalog/language/vietnamese/vietnamese.php
Merge branch 'feature/trello_15' of github.com:quangthi90/SongNguyen into feature/trello_15
 - Update text faq.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
 - Update for language.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
 - Update for language.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
Merge pull request #12 from quangthi90/feature/trello_15

 - Update for faq & faq category.
Merge branch 'develop' of github.com:quangthi90/SongNguyen into feature/trello_16