Code Console fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	codeconsole.html
	coffee/codeconsole.coffee
	js/codeconsole.js
	less/console.less
	style/console.css
	teacherhome.html