redesign and etc
Merge branch 'master' of github.com:mmoutenot/concierge-web