添加toolbox支持，更新组件
Merge branch 'master' of github.com:haozileung/JFMS

Conflicts:
	src/main/java/com/haozileung/jfms/controller/DictionaryController.java
	src/main/java/com/jfinal/ext/interceptor/REST.java
	src/main/java/com/jfinal/render/VelocityRender.java
	src/main/webapp/WEB-INF/template/settings/dictionaries.html
	src/main/webapp/WEB-INF/velocity.properties

Signed-off-by: Haozi <yamchaleung@gmail.com>