Merge branch 'master' of github.com:eaudeweb/flis.live_catalogue

git-svn-id: https://svn.eionet.europa.eu/repositories/Python/flis.live_catalogue@131 60810c31-268d-49e0-9aa7-0fbff4fae3ae
Added supervisor to requirements.txt

git-svn-id: https://svn.eionet.europa.eu/repositories/Python/flis.live_catalogue@132 60810c31-268d-49e0-9aa7-0fbff4fae3ae
removed supervisor from requirements-dev.txt
Merge branch 'master' of github.com:eaudeweb/flis.live_catalogue