增加切换背景图功能，已做预加载
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/layout.js
	public/js/main.js