Merge branch 'ratjens' of github.com:marketboomer/nunchaku into ratjens

Conflicts:
	app/controllers/concerns/nunchaku/moving.rb
Merge branch 'ratjens' of github.com:marketboomer/nunchaku into ratjens