Merge pull request #3 from EPICPaaS/master

rebase
l
Merge branch 'miicaa' of https://github.com/EPICPaaS/appmsgsrv into miicaa
l
db
Merge branch 'miicaa' of https://github.com/EPICPaaS/appmsgsrv into miicaa
Merge pull request #6 from EPICPaaS/master

rebase
#5
js客户端-sessionId添加
js客户端-sessionID添加
#5
.
.
.
.
.
l
Merge branch 'miicaa' of https://github.com/EPICPaaS/appmsgsrv into miicaa

Conflicts:
	client/js/README.md
	client/js/demo/main.go
	client/js/demo/static/jquery-1.11.1.min.js
	client/js/demo/static/msg-js.js
	client/js/demo/static/ws-flash/WebSocketMain.swf
	client/js/demo/static/ws-flash/swfobject.js
	client/js/demo/static/ws-flash/web_socket.js
	client/js/demo/template/demo.html
	client/js/flash-security-policy-server/main.go
	client/js/flash-security-policy-server/socketpolicy.xml
.
.