added checkin button stuff to update marker
Merge branch 'master' into jack