Merge branch 'master' of /home/dinis/Dropbox/Cadeiras/IPM/rails with conflicts.