fixed: ErrorBuilder.add(ErrorBuilder)
fixed: remove comments
Merge branch 'master' of https://github.com/totaljs/framework

Conflicts:
	minify/merged/total.js
minify and merge
added: debug-start, debug-restart
fixed: websocket middleware
updated: image processing
fixed: events
Merge branch 'master' of github.com:totaljs/framework