bugs with lamps and routes are fixed
Merge branch 'master' of https://github.com/KernelCorp/vector

Conflicts:
	Gemfile
	Gemfile.lock