gitignore
Merge remote branch 'github/master'
apache
Merge remote branch 'github/master'
Merge remote branch 'github/master'
Merge remote branch 'github/master'
remove sitebase default footer (static english)
footer customization
custom css and logos
site header block custom (no matter about db), static logo
epipop logo
fusion branche epiwork
Merge remote branch 'github/master'

Conflicts:
	apps/reminder/models.py
	apps/reminder/tests.py
	locale/nl/LC_MESSAGES/django.mo
	media/base/css/default.css
	templates/base/sitebase.html
Merge remote branch 'github/master'

Conflicts:
	locale/nl/LC_MESSAGES/django.mo
	templates/base/sitebase.html
cosmetic css menu
Merge remote branch 'github/master'
Merge remote branch 'github/master'

Conflicts:
	locale/nl/LC_MESSAGES/django.mo
Merge remote branch 'github/master'

Conflicts:
	locale/nl/LC_MESSAGES/django.mo
texte en fr
texte bannière en fr
Merge remote branch 'github/master'