Merge branch 'master_up'
static image loading
Merge branch 'loading_image'