Last changes to app
Merge branch 'origin/london_hackaton'