incoming messages now get tracked by location
fixed bootstrap.js merge conflict