21/01/2013 uploader
Merge branch 'master' of https://github.com/raalveco/diseno.git

Conflicts:
	app/controllers/uploader_controller.php