Quitando versionamiento de la carpeta wp-content/uploads
Merge branch 'ver2014' of https://github.com/estrategasdigitales/onisuzume into ver2014

Conflicts:
	wp-content/uploads/2013/08/img_misplaceres1-450x225.jpg
	wp-content/uploads/2013/08/po_queridos.png