Create loading page
Merge conflicts
Merge branch 'loading_page' into development