yolo
Merge branch 'master' of https://github.com/aijkoopmans/das4

Conflicts:
	cp1.2aar/main
	cp1.2aar/main.dSYM/Contents/Resources/DWARF/main