Fixed bug with loading animation in boot state
Merge branch 'master' into gh-pages