update
Merge remote-tracking branch 'origin/master'

Conflicts:
	2013/08/test.html
update