Merge branch 'morphemic-rc1.5' into 'doap-model-metadata'
# Conflicts: # web-crawler/CrawlerDatabase.py # web-crawler/Integrator.py # web-crawler/Orchestrator.py # web-crawler/README # web-crawler/RepositoryCrawler.py # web-crawler/RepositoryCrawlerThread.py # web-crawler/Utils.py # web-crawler/apache_data_fetcher.py # web-crawler/config # web-crawler/database/createCrawlerDB.sql # web-crawler/doap_project.py # web-crawler/github_data_fetcher.py # web-crawler/jquery_plugin_data_fetcher.py # web-crawler/r_forge_data_fetcher.py # web-crawler/startCrawler # web-crawler/stopCrawler