Add dictionary module.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/zrich/business/EventBusiness.java
	src/main/webapp/index.html