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

Conflicts:
	Projektet/appcompat_v7/bin/android-support-v7-appcompat.jar