Merge branch 'master' of https://github.com/KernelCorp/vector

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/KernelCorp/vector

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/active_admin.js
	config/routes.rb
Merge branch 'master' of https://github.com/KernelCorp/vector

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/active_admin.js
	config/routes.rb
Merge branch 'master' of https://github.com/KernelCorp/vector