更新
更新

新添加了前台登陆页面
Merge branch 'master' of https://github.com/wikimo/jinbi

Conflicts:
	src/com/jinbi/action/front/FBaseAction.java
	src/com/jinbi/config/fstruts.xml