reset
Merge remote-tracking branch 'origin/beta' into beta

Conflicts:
	Application/Home/View/Twentytwelve/Archive/single-list.html