GUI
Merge branch 'master' of https://github.com/SWTI2014/SWTI2014-Project-10

Conflicts:
	packages/Project10-Core.package/SnarlGUI.class/methodProperties.json
	packages/Project10-Core.package/monticello.meta/version