Change in ActionTest.java
Merge branch 'master' of https://github.com/lemonleavesE/WordMaster

Conflicts:
	user.conf