Merge pull request #145 from apotheos/master

Bugfixes for Editor
Merge branch 'master' of github.com:CSC495-2014/TeamworkEnglewoodGit