Merge branch 'master' into develop
laziload html and popup container
Merge branch 'issue-53' into develop
update version
Merge branch 'release_0.3.12'