+ commit to pull only --
Merge branch 'gui2' of
https://github.com/Tokanagrammar/tokanagrammar-dev into gui2

Conflicts:
	src/main/java/edu/umb/cs/demo/DemoTokens.java
+ updated resource files