Commit
Merge branch 'master' of https://github.com/tinhphong007/navi

Conflicts:
	composer.json