Merge pull request #835 from oliverds/master

Menu Icon Picker, sidebar collapse improvement, oc-panel stats not loading
working on #13
closes #13
Update to Bootstrap 3.2
Merge remote-tracking branch 'upstream/master'