Moving controller to top-level
Merge remote-tracking branch 'origin/master'

Conflicts:
	model/application.rb