Support path expansion
Merge branch 'master' of https://github.com/medusa-project/medusa-rails3

Conflicts:
	app/models/book_tracker/filesystem.rb
Update progress every 1000 records
Fix incorrect URI and report skipped lines