Continued on event
Merge branch 'master' of https://github.com/wisingd/Dajoroli

Conflicts:
	Projektet/SplitIt/bin/SplitIt.apk
	Projektet/SplitIt/bin/classes.dex
	Projektet/SplitIt/bin/resources.ap_
	Projektet/appcompat_v7/bin/android-support-v7-appcompat.jar