Merge pull request #18 from korczis/stable

Stable
Disabled manifest and cucumberjs
Merge branch 'master' of github.com:korczis/the-scratch
Phrases
Merge pull request #19 from korczis/master

Merge Master to Stable