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

Conflicts:
	config/application.rb