1
Merge branch 'master' into liujia

Conflicts:
	settings.js
1
Merge branch 'master' into liujia

Conflicts:
	app.js
	source/routes/index.js
1
1
1
1
1
1
1
Merge branch 'master' into liujia
Merge branch 'master' into liujia
1
1
1
1
Merge branch 'master' into liujia
1
1