Updated app and server
Merge branch 'master' of github.com:davidecassenti/wallie