Remove the loader div
Merge branches 'development' and 'master'