#135, #134 - renamed, added tabs
#139 - linking AbstractDictionary to ResourceConfiguration
         - modifying dao's so they filter by config id
         - modifying json endpoints so that they take into account the id
         - modifying tests so they still run :)
Merge remote-tracking branch 'origin/importerConfiguration'

Conflicts:
	HDX-System/resources/db/4_sample.sql
	HDX-System/src/main/java/org/ocha/hdx/rest/AdminResource.java
	HDX-System/src/main/webapp/WEB-INF/jsp/admin/admin-menu.jsp
	HDX-System/src/main/webapp/WEB-INF/jsp/admin/editResourceConfiguration.jsp
	HDX-System/src/main/webapp/WEB-INF/jsp/admin/resourceConfigurations.jsp
	HDX-System/src/main/webapp/css/style.css
	HDX-System/src/test/java/org/ocha/hdx/importer/ScraperImporterTest.java