mongo的图片存储

mongo的图片存储
Merge branch 'master' of https://github.com/dymx101/PicStory

Conflicts:
	server/hessian_master/pom.xml

server/hessian_master/src/main/java/com/towne/data/mongodb/examples/hell
o/AppConfig.java

server/hessian_master/src/main/java/com/towne/data/mongodb/examples/hell
o/HelloMongo.java

server/hessian_master/src/main/java/com/towne/hessian/ApplicationHessian
Test.java
	server/hessian_master/src/main/java/com/towne/hessian/BasicAPIImpl.java

server/hessian_master/src/main/java/com/towne/hessian/service/StorageSer
vice.java

server/hessian_master/src/main/java/com/towne/hessian/service/StorageSer
viceGridFSImpl.java

server/hessian_master/src/main/java/com/towne/hessian/test/HessianTest.j
ava
	server/hessian_master/src/main/resources/hessian-app.xml
	server/hessian_master/src/main/resources/mongodb-bootstrap.xml

server/picStoryServer/src/main/java/com/towne/framework/common/service/S
torageService.java

server/picStoryServer/src/main/java/com/towne/framework/springmvc/contro
ller/StorageController.java
	server/picStoryServer/src/main/resources/spring-hessian-client.xml