Merge branch 'Front-End'
some loading issues
Merge branch 'master' into Front-End