fixbug
Merge branch 'master' of https://github.com/jysperm/RootPanel

Conflicts:
	package.json