for merge
Merge branch 'master' of https://github.com/Kunano/chrome-ext-timetrack

Conflicts:
	js/inject.js