fixes #72
Merge branch 'master' of https://github.com/franklingu/Visual-IDE

Conflicts:
	Visual-IDE/js/app.js
Merge branch 'master' of https://github.com/franklingu/Visual-IDE