no more multiple countersgit add .
removing ui-btn-pressed
merged mikkel
fixed loads of stuff
Merge branch 'andreas' into mikkel