no message
Merge branch 'pluggedin_live' of https://github.com/element4git/pluggedin

Conflicts:
	code/object.js
fixed removing divs