- Update for new & news category language
 - Update for event language.

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

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
Merge branch 'develop' of github.com:quangthi90/SongNguyen into feature/trello_9
 - Update for popup & program language.

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

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

Conflicts:
	admin/language/english/common/header.php
 - Update database

Signed-off-by: bommer <bommer@bommerdesign.com>
Merge branch 'feature/trello_9' of github.com:quangthi90/SongNguyen into feature/trello_9

Conflicts:
	sn-edu.sql

Signed-off-by: bommer <bommer@bommerdesign.com>
 - Update database

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

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

Conflicts:
	sn-edu.sql
 - Update for faq.

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

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
Merge branch 'develop' of github.com:quangthi90/SongNguyen into feature/trello_9
 - Update for popup_id in news category.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
 - Update for add popup for news category.

Signed-off-by: vn3352 <vn3352@bommerdesign.com>
 - Remove popup_id from news category.

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