Command bar rendering implementation
Remediating merge conflict
Resolving merge conflict
Merge branch 'master' of github.com:blackboard/hayabusa

To resolve merge conflict.
Merge branch 'master' of github.com:blackboard/hayabusa