Merge origin/master

Conflicts:
	src/com/toy/anagrams/lib/StaticWordLibrary.java
Merge origin/master