No more gl error - Display the error in the viewer
Merge branch 'develop' of github.com:buttleofx/ButtleOFX into develop

Conflicts:
	buttleofx/data/buttleData.py