add @ to username
Merge branch 'master' of /var/git/telemeta into dev
fix styles
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
add has_mediafile (sound) to all resources
no publish references if empty
remove reference field
cleanup migrations, add descriptions to resource prepare migration from charfield to textfield
re-add resource reference removal
add templates and fix admin menu
Instrument.description from charfield to textfield
set description_old
keep old description
collection.doctype optional
undo alt_ids exception for 'Sous-table...'

Conflicts:
	telemeta/templates/telemeta/collection_detail.html
update diags
fix unicode xml parsing
add collection zip get methods, add debug_toolbar to sandbox
add collection zip get methods, add debug_toolbar to sandbox, jquery 2.0.3
Adapt analyze method to timeside 0.5.x, update download and streaming format