build
Merge branch 'master' of github.com:Plou/plou.github.io

Conflicts:
	css/78cf.main.css
	css/a3ea.main.css
	css/aca9.main.css
	default/2013/09/01/hi-there/index.html
	demo/assets/columnManager/columnManager.js
	demo/assets/columnManager/columnManager.map
	demo/assets/columnManager/main.js
	demo/assets/columnManager/main.map
	demo/columnManager/index.html
	index.html
	programming/2013/10/05/jfinder/index.html