fix base, nullpointer on beanService,
fix base, nullpointer on beanService,
fix base, nullpointer on beanService,
fix base, nullpointer on beanService,
fix base, nullpointer on beanService,
Successful commit i hope
Successful commit i hope
Successful commit i hope
Successful commit i hope
Successful commit i hope
111
Successful commit i hope
Merge branch 'origin/trunk' into trunk
Merge remote-tracking branch 'origin/master' into some

Conflicts:
	news.ipr
	news.iws
	service/src/main/java/com/pvt/NewsService.java
	service/src/main/java/com/pvt/UsersService.java
fix base, nullpointer on beanService,
fix base, nullpointer on beanService,
fix base, nullpointer on beanService,
Merge branch 'trunk' into master1

Conflicts:
	controller/src/main/java/admin/EditCategoryCommand.java
	news.iws
fix base, nullpointer on beanService,