Merge branch 'master' of https://github.com/scoop1120/leap_web

Conflicts:
	manifest.json