filter fixes
Merge branch 'thomas' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into thomas
improved DebugActivity performance, bugfixes
bugfix import
Merge branch 'thomas' of https://github.com/tcuje/PraktikumSS13-WLAN-Fingerprint into thomas
minor fixes
bugfixes
quality indicator
wip meeting
activity descriptions
#5 and bugfix
added map files, bugfixes
merged tcuje into dev
license added
license moved
restored Tuple
bugfix
richtungsgewichtung, layout improvements, bugfixes, farbei bei location results
Merge branch 'xmlfix' into dev

Conflicts:
	WPS/res/layout/activity_measure.xml
	WPS/src/de/rwth/ti/common/IPMapView.java
solved conflict