Merge branch 'develop'
Merge branch 'master' into rob

Conflicts:
	Assets/TVisLayoutScene.unity
Merge commit '8c3d73c5b1a57cd01f12ced632f6afcce1ff42d7'
Add meta for new objects
Add lighting to La Parouse Scene
Darken the lighting
Make parsing errors more clear
Merge remote-tracking branch 'mrjackdavis/develop' into develop