default list of type of media added
Merge branch 'master' of https://github.com/danieleguido/sven
Merge branch 'master' of https://github.com/danieleguido/sven
wqMerge branch 'master' of https://github.com/danieleguido/sven
Merge branch 'master' of https://github.com/danieleguido/sven
Merge branch 'master' of https://github.com/danieleguido/sven
Merge branch 'master' of https://github.com/danieleguido/sven
Merge branch 'master' of https://github.com/danieleguido/sven
debugging text extraction from real data
Merge branch 'master' of https://github.com/danieleguido/sven

Conflicts:
	sven/models.py
document debug save