aa
Merge branch 'master' of https://github.com/handsomeTom/dream_backend

Conflicts:
	src/ehcache.xml
去除二级缓存和session
Merge branch 'master' of https://github.com/handsomeTom/dream_backend
BUG:
1.图片为null
2.所有的事件添加地点和时间