stuff
Merge branch 'master' of https://github.com/lekland/exjobb

Conflicts:
	SamplePreferenceActivityOur/bin/SamplePreferenceActivityOur.apk
	SamplePreferenceActivityOur/bin/classes.dex
	SamplePreferenceActivityOur/bin/resources.ap_
hejhej
Merge branch 'master' of https://github.com/lekland/exjobb

Conflicts:
	SamplePreferenceActivityOur/bin/SamplePreferenceActivityOur.apk
	SamplePreferenceActivityOur/bin/classes.dex
	SamplePreferenceActivityOur/src/com/sonymobile/smartconnect/extension/sensorsample/Recording.java