Beautify the code.
Merge branch 'dev' of github.com:hungnq1989/binhluananh into dev

Conflicts:
	main.js