Fixes timers clocks
Updates build
Merge branch 'master' into gh-pages

Conflicts:
	Swat.map.js
	Swat.min.js