Resources consolidation and Notifications
Merged in master
Deleted merge files
Merge pull request #1 from NikolajLund/sobu-nilu-noosphere

Sobu nilu noosphere
PDA activity changes
Corrected Package references
Updated assembly bindings.  Fixed error in AS
Activity now has owner ID rather than a complete owner. Overridden equals for Noo.
Fixed HandleMessage for IActivity
Merge branch 'master' of https://github.com/NikolajLund/NooSphere
Fixed remove models
Merge from upstream for bugfixes and Device update.
 s
Merge branch 'master' of https://github.com/NikolajLund/NooSphere
Fixed device communication
Removed adddevice in activity client, port is changed in webapiserver
Merge from upstream to fix Zeroconf bug
Port damnit!
Location tracking framework changes
Name of detectors now only include word characters.