First demo version
Bugfix
Merge branch 'feature/Landing_page' into develop