bugfixes
Merge branch 'master' of https://github.com/EarlyAdopterPro/ng_grittr