1.3

10.1
1.3 qa

Liu's part
1.3 liu

liu
Merge remote-tracking branch 'upstream/Jessie'

Conflicts:
	app/views/Application/index.html
	app/views/main.html