refs #5 Done some changes in Movement Controller
refs #5 Done some changes in Movement controller
Merge branch 'master' of github.com:joshsoftware/21nautica

Conflicts:
	app/controllers/movements_controller.rb
	app/views/movements/index.html.haml