wow dunno what this commit is need for but here goes nothing
Merge branch 'master' of ssh://git@github.com/kryptick/bubblebathbay.git

Conflicts:
	defaultMayaEnv/shelf_BBB.mel
	defaultMayaEnv/site-packages/maya/app/mayabullet/__init__.py
	defaultMayaEnv/site-packages/maya/app/stereo/stereoCameraUtil.py
Merge branch 'master' of ssh://git@github.com/kryptick/bubblebathbay.git