Added columns to right side of scene
Merge branch 'master' of https://github.com/asweingarten/Jasmine

Conflicts:
	resources/data.xml.bak