Merge branch 'master' of github.com:erikhenrique/gps-tracker

Conflicts:
	web-app/controllers/checkpoints_controller.rb