cleaning directory
fix nothing
fix nothing
Merge branch 'master' of github.com:pythdasch/atmosphere

Conflicts:
	gallery/migrations/0001_initial.py
	locale/fr/LC_MESSAGES/django.mo
	locale/fr/LC_MESSAGES/django.po