Merge branch 'feature/frontEndFeature' into develop
Merge branch 'develop' of https://github.com/betkom/matsi into develop
Home page done
resolved footer conflict