fbravo20130520
fbravo20130520
Merge branch 'master' of https://github.com/omca/UPC-DEW-ProyectoFinal-R51A

Conflicts:
	linkedin_upc/app/models/user.rb
subiendo model_user
commit1 omar
commit1
commit1
commit1