Merge branch 'release/2.0.2' into develop
Merge branch 'master' of github.com:krtek/Tea-clock into develop
Merge branch 'master' into angular
Angular.js version
Ignoring js/
English version
Glitches
Fixed HTML names
Bumped up version number