fix on application controller
Merge branch 'feature-generatorUi' of https://github.com/nicky-isaacs/TerrainGenerator into feature-generatorUi

Conflicts:
	app/controllers/application_controller.rb