修改取localStorage
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/ctrl/controller.js
	www/ctrl/main.js