fix app errors, update npm
Merge branch 'develop'