Added temp view
Merge branch 'master' of https://github.com/Desocrit/Scripting

Conflicts:
	server.pyc
Resolved conflict
Minor fix
Revert "Minor fix"

This reverts commit fa2ee1cc5fb76a178b23cb069e3fbe6303eaf11e.
Broke my own code, reverted to simpler temporarily
Merge branch 'master' of https://github.com/Desocrit/Scripting