local commit
Merge branch 'master' of https://github.com/marietambvg/TabataTimer

Conflicts:
	TabataIntervalTimer/Tabata/default.html
	TabataIntervalTimer/Tabata/pages/home/home.html
	TabataIntervalTimer/Tabata/pages/home/home.js
	TabataIntervalTimer/Tabata/pages/home/homecodebehind.js
	TabataIntervalTimer/TestTabata/default.html
fixed promises