createViewSet
Merge branch 'master' of https://github.com/RosebudInteractive/ProtoOne

Conflicts:
	public/uccello/uccelloServ.js