* First attempt to use jade templates in Django
Merge branch 'develop' into feature/report_mailing_redesign

Conflicts:
	design/reports_mailing/src/jade/index.jade
	website/settings/defaults.py
ajustes en imágenes y layout
Merge branch 'feature/report_mailing_redesign' into feature/email_notifications_with_recomendations
* Re integrated database
cambio de colores
cambio de logo en ripley y padding
psd con logos
header
asjustes
recomendaciones
ajustes de coolor y alturas
EEEEEE
OCD
* Removed unnecesary files from report design
* Added new fields to Store and ProductType models
* Started implementing rich HTML template with real data
* Finished implementing mailng reports for products without secondary products
* Changd styling a bit
psd
stocks