Saving stuff
Warnings and dead code
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Merge branch 'controller'