.
Merge branch 'master' of github.com:jamesread/solutionBuilder

Conflicts:
	editor.php
	frontend/resources/javascript/hud.js