Merge branch 'master' of https://github.com/abrongersma/license_central into html-kickstart

Conflicts:
	README.md
	app/controllers/publishers_controller.rb
	app/models/publisher.rb
	app/models/software_package.rb
	app/views/layouts/_navigation_links.html.erb
	app/views/licenses/index.html.erb
	app/views/publishers/index.html.erb
	config/application.example.yml
	config/environments/development.rb
	config/initializers/devise.rb
	config/routes.rb
Merge branch 'html-kickstart' of https://github.com/abrongersma/license_central into html-kickstart

Conflicts:
	README.md
	app/controllers/publishers_controller.rb
	app/models/publisher.rb
	app/models/software_package.rb
	app/views/layouts/_navigation_links.html.erb
	app/views/licenses/index.html.erb
	app/views/publishers/index.html.erb
	config/application.example.yml
	config/environments/development.rb
	config/initializers/devise.rb
	config/routes.rb