update
Merge branch 'master' of https://github.com/anderszhang/h5-loader-time

Conflicts:
	.idea/workspace.xml