Removed SoundCloud and OHAttributedLabel
Merge branch 'dexterfeature' into develop
Fixing some conflicts