Changes in layout and server
Merge branch 'master' of github.com:worxli/hackzurich14