change application
Merge pull request #2 from tran-vinh-mulodo/dev#2

change application
Merge branch 'master' into dev#1

* master:
  change application

Conflicts:
	app/controllers/application_controller.rb