Merge branch 'master' of https://github.com/nguyenducgiang/test

Conflicts:
	app/assets/stylesheets/custom.css.scss
	config/application.rb