erase devise
Add some little changes to mashup controller, mashup, link and keyword models
avances usuario
merge
avance mashup listo y user normales
agregar atributos
hola
Arreglando
Merge branch 'controller_master' of https://github.com/pelluch/mashups-backend into controller_master
avance
avane
rutas casi lsitas
listo exepcto create y update mashup
merge