merged
ubisense
ubinsense integration
xmpp should be working now
location actually works
LocationAwareActivity

the idea is that any activity that needs to register a ubisense location
service just extends from LocationAwareActivity which handles all the
creation of the service and tear down. that way we do not litter all the
other activities with ubisense location logic.
required library for ubisense
disable fragment caching
- this fixes a bug where room controls would be blank after entering a
  room twice
set ip via dialog
rework settings dialog
Merge branch 'ubisense'
cleaning up
dont reset xmpp-server-addr on startup
use sherlock's theme to make it run before android-4