clock
Merge branch 'master' into clock

Conflicts:
	src/layers/HudLayer.js
Merge pull request #90 from startupcursos/clock

clock