added feedback event
Merge branch 'master' of https://github.com/franklingu/Visual-IDE

Conflicts:
	client/app/1.html
cleaned up