fixed bugs
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev