[ADD] Depumptoire version
Merge git://github.com/e14n/pump.io

Conflicts:
	public/javascript/pump/router.js
	public/template/post-note.utml
	public/template/post-picture.utml