Working on time barrier
Merge branch 'master' of https://github.com/serprex/openEtG

Conflicts:
	etg.js
Fixed bugs (maybe)
Merge branch 'master' of https://github.com/serprex/openEtG

Conflicts:
	etg.js
Merge branch 'master' of https://github.com/serprex/openEtG
Draw active logic got lost somewhere in git merges