Remove ServerApp from .gitignore
Merge remote-tracking branch 'origin/item-module' into item-module
Merge branch 'item-module' into item-module-test