added activity, location and user data
Merge branch 'master' of github.com:salilgupta1/OnTheMove
add db file back