Emergency button added
Merge branch 'master' of github.com:fblandroidhackathon/persontracker