adding search by media type also on the files
Merge remote-tracking branch 'upstream/master'
Merge pull request #43 from amikhile/master

adding search in files by filetype
Vurtial Lessons - all kinds of editing - bugfix
Merge remote-tracking branch 'refs/remotes/origin/master'
tree problems
Add events to all links; add events to player
"support" AdBlock
organize coffescripts much better
php: wsxml.php replacement
php: wsxml.php replacement
Do not offer "Edit" for virtual lesson
Remember last locale selection. Default route for unknown languages.
Bugfix: When combining Containers to VL, VL's film date should be equal to containers film_date, and not to creation date.
GA support
GA support
Update solr config backup files
Support editing File Types
support for file extensions up to 10 chars
adding ability to search with multiple media types