Merge pull request #15 from thuydx/master

Update DB
Merge pull request #16 from thuydx/dev

Dev
change vendor

Signed-off-by: Thuy Dinh Xuan <thuydx@zendgroup.vn>
Merge branch 'dev'
Merge pull request #17 from thuydx/master

Switch vendor and add module SyntaxHighLight
users module
Merge pull request #18 from thuydx/master

users module
Update README.md
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	configs/application.config.php
	frontend/Users/Module.php
	frontend/Users/autoload_classmap.php
	frontend/Users/config/module.config.php
	frontend/Users/src/Users/Controller/IndexController.php
	frontend/Users/src/Users/Form/Base.php
	frontend/Users/src/Users/Form/Register.php
	frontend/Users/src/Users/Form/RegisterFilter.php
	frontend/Users/src/Users/Service/User.php
	public/.htaccess