fix resize
Merge branch 'master' of github.com:raupe/neurron

Conflicts:
	display/scripts/manager.js