fixed bug so that it can handle making kingdom without params
Merge branch 'master' of https://github.com/michaeljb/DKSAAS

Conflicts:
	app/controllers/kingdoms_controller.rb