Emergency bug fix
Merge branch 'master' of https://github.com/jupl/cinder-brunch into cordova