Add LoggerClass to JavaScript and cleanup some JavaScript code
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/proxy.js