-added routes to calibrate using manually selected points from calibrate page
Merge remote-tracking branch 'origin/master' into master2