Starting router work
Merge branch 'refs/heads/master' into ajaxified
Moving along nicely
Merge branch 'refs/heads/master' into ajaxified

Conflicts:
	app/controllers/application_controller.rb
Allowing params