save
save
save
save
save
Merge remote branch 'upstream/master'

Conflicts:
	config.example.json
	public/js/lottery.js
	public/js/smile.js
	public/js/upload.js