fix issue #6
Merge branch 'master' of github.com:AirCoding/AirCoding

Conflicts:
	app/public/js/workplace/view/editor.js