fix server
Merge branch 'master' of https://github.com/kentran/ZooManicServer

Conflicts:
	Session.js