save
Merge branch 'master' of github.com:limijiaoyin/smile

Conflicts:
	public/js/lottery.js
	public/js/smile.js
	public/js/upload.js