Merge branch 'feature/prowl-notification'
typos
moved app server to unicorn