Mini fix in answer test
Merge branch 'rails4' of github.com:francocatena/mawida_app into rails4
Change update_attributes to update