Color selection for painting.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
Start out with gray, fix coloring smaller portions by (similar to deleting)
breaking up leaf nodes into their components.
Focus tweak; focus isn't returning to the GL widget after closing the color
dialog on OS X.
Just manually request focus.
What matters is the active state, not the focus.
Merge branch 'master' of https://github.com/worklist/hifi

Conflicts:
	interface/src/Application.cpp
Merge pull request #313 from ey6es/master

Voxel painitng with color selection, fix for coloring subvoxels (must break up larger ones).