Switching button coloring over to Jasmine's drawable implementation for play and display screens
Untracking some files...
Merge branch 'master' of https://github.com/Dr-Evans/O2O