using ui-switch
Merge branch 'switchery'