Sync updates.
Merge branch 'master' of github.com:FNNDSC/chrisreloaded
Switch to circle icon set.