Merge branch 'master' of https://github.com/xiaovn/xvn

Conflicts:
	controller/appController.php