Merge remote-tracking branch 'upstream/master' into user_and_fidelization
Merge with origin of fork
Merge remote-tracking branch 'upstream/master'
Merge with master
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into user_and_fidelization
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into user_and_fidelization
Latest merge
Merge branch 'master' into user_and_fidelization
Se agrega multi Tenant al componente
Se agrega la dependencia al purchase.web a reward
Se incluye tenant al servicio createbonus
Remove unnecesary library
Facebook
Merge branch 'master' of https://github.com/jhonatan89/miso4204_marketplace

Conflicts:
	Marketplace/user.web/src/main/webapp/src/component/loginComponent.js
Componente de Autenticación Google+

Se adiciona el componente de configuracion que realiza la autenticacion
con google+
Merge entre Facebook and google

Merge entre Facebook and google
Merge branch 'master' of https://github.com/jhonatan89/miso4204_marketplace

Conflicts:
	Marketplace/user.web/src/main/webapp/login.html
Cambio del puerto tomcat y cambio de URL absoluta por relativa