fix a little bug
Merge https://github.com/jitongming/Memory-server

Conflicts:
	app/controller/memoryController.php
modify a lot