New markdown support
Merge branch 'master' of github.com:thagat/nosotrosusamos

Conflicts:
	cms/templates/includes/summary.jade