-added enable/disable logging functionality
Merge branch 'master' into gh-pages

Conflicts:
	dist/jasper.min.js