Merge branch 'hotfix/loading-animation'
lint
grunt
fix #179
Merge branch 'hotfix/layer-align' into develop