all branches to github
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
cleanup
fix folded divs
add mimetype to item
add mimetype to item.str, fix no file for mimetype
fix os
add partial state to PUBLIC_ACCESS_CHOICES, add fr locales for all those states
go to 1.4.5
rm locales : go to a separate (submodule) repo
cleanup
update locales
fix item mime_type processing
undo submodule for locales
readd locales
Merge branch 'dev'
Merge branch 'master' into lam

Conflicts:
	telemeta/locale/de/LC_MESSAGES/django.mo
	telemeta/locale/de/LC_MESSAGES/django.po
	telemeta/locale/de/LC_MESSAGES/djangojs.mo
	telemeta/locale/de/LC_MESSAGES/djangojs.po
	telemeta/locale/fr/LC_MESSAGES/django.mo
	telemeta/locale/fr/LC_MESSAGES/django.po
	telemeta/locale/fr/LC_MESSAGES/djangojs.mo
	telemeta/locale/fr/LC_MESSAGES/djangojs.po