cofict git
Merge branch 'master' into dev#1

* master:
  change application

Conflicts:
	app/controllers/application_controller.rb
Merge pull request #3 from tran-vinh-mulodo/dev#1

cofict git