Add CSS only clips
Finish user clip
Implement content and group clips
Merge origin/newframework and fix conflicts
Merge remote-tracking branch 'origin/newframework' into clips
Merge remote-tracking branch 'origin/newframework' into clips
Fixes per code review
Brought admin UI up to date on new framework
Follow up per code review
Make color CSS uppercase
Merge branch 'clips' of git://github.com/bp323/3akai-ux into clips
Simplifications to clips
Fixed vertical alignment issues
Merge pull request #2610 from nicolaasmatthijs/adminUI

Admin UI in new framework
Visibility icon improvements, skinning improvements, documentation addition, structure simplification
Merge branch 'clips' into newframework
Merge branch 'newframework' into register

Conflicts:
	shared/oae/css/oae.base.css
Followed up on code review