Merge branch 'hotfix/PaypalUrls'
Configuración para puesta en producción
Merge branch 'master' of https://github.com/zeickan/Django-Store
Migración a dominio redcarpetmanicure.com.mx
Función para envío de correo usando SMTP de Google
Merge branch 'develop'
Conekta.io KeyAPI producción
Merge branch 'master' of https://github.com/zeickan/Django-Store
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/zeickan/Django-Store
Cambios Api y Login
Merge branch 'master' of https://github.com/zeickan/Django-Store

Conflicts:
	store/api.py
Cambios de tiempo slide
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	static/images/slide2.jpg
Merge branch 'develop' into feature/SendMail
Merge branch 'feature/SendMail'