Fix setup.py to require selenium 2.35
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
new machine updates
fixing version mismatch of Selenium from 2.20 to 2.35
Merge remote-tracking branch 'upstream/dev' into P54191034-tutorial-nozzle-geometry
Initial changes for geom-viewer crash openmdao.
Merge branch 'dev' of http://github.com/OpenMDAO/OpenMDAO-Framework into dev
Merge branch 'dev' of http://github.com/OpenMDAO/OpenMDAO-Framework into dev
Parametric geometries viewable using new pyV3D focus. stl_group overwrites default bias of stlsender.
Merge remote-tracking branch 'upstream/dev' into fix-camera
Resolved merge conflict.
update terminology model => project
When installing plugins, building the docs should come after installing the dependencies since doc building involves importing dependencies
Merge pull request #1466 from hschilling/P56973372-error-messages-installing-plugins

When installing plugins, building the docs should come after installing ...
fixes to plugin quickstart
fixing test to include _static dir
Merge branch 'dev' of http://github.com/OpenMDAO/OpenMDAO-Framework into dev
Merge branch 'dev' of http://github.com/OpenMDAO/OpenMDAO-Framework into docbuild
Merge branch 'gui' of github.com:swryan/OpenMDAO-Framework into gui

FIXED Conflicts:
	openmdao.main/src/openmdao/main/project.py
fix gui tests