Merge remote-tracking branch 'upstream/develop' into feature/multinodes-mode
Ignore harvester logs.
fixed a find bugs error and initializing the test database on linux
Merge pull request #6 from fxprunayre/feature/multinodes-mode

Align branch to develop
modifying wro4j so that web-client can be accessed via wro4j
Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork into javascript_build

Conflicts:
	core/src/test/java/org/fao/geonet/AbstractCoreIntegrationTest.java
	web/src/main/webapp/WEB-INF/config-security/config-security-mapping.xml
more fixes for javascript build.
Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork into develop
full build now passes
one last fix for tests.
fix for harvester destroy when removing a harvester that has a sourceid of a source that doesn't exist.
#334 Metadata editor: datetimes values are lost in IE after editing and saving the metadata
reduce logging in tests.
Merge pull request #333 from ianwallen/develop

revert update statements that were incorrectly modified
Port fix for create tests from javascript build branch
Fix adding CRS now using gnEditorXMLService.
change MetadataManagerService to EditorService
Integrate map directive into XSL templates
Add service to get catalog config.
Merge remote-tracking branch 'origin/refactor_editorui' into refactor_editorui

Conflicts:
	web-ui/src/main/resources/catalog/components/edit/directoryentryselector/DirectoryEntrySelector.js
	web-ui/src/main/resources/catalog/js/edit/EditorController.js