Merge remote-tracking branch 'geigerzaehler/background_log'

Conflicts:
	README.md
	tasks/grunt-karma.js