More ui work
Merge branch 'master' of https://github.com/bladecoder/story-maker

Conflicts:
	adventure-composer/src/org/bladecoder/engineeditor/glcanvas/FACanvas2.java
	story-maker/src/org/bladecoder/engineeditor/glcanvas/FACanvas.java
	story-maker/src/org/bladecoder/engineeditor/glcanvas/FACanvas2.java