#601 fixed following bram comment (fixing regexp)
Merge branch 'apiv2'
Merging with apiv2
fix error with anyoption
Merge branch 'apiv2'
Merge branch 'master' of github.com:MTG/freesound
Moved essentia executable and api settings config parameters in settings.py
Updating settings.py so DATA_URL can be set in settings and overwritten in local_settings if desired, without depending on DEBUG variable
Merge branch 'apiv2'
Merge branch 'apiv2'
Updated apiv2 solr limits