Conflicts:
	messif/algorithms/impl/LocatorStorageAlgorithm.java
	messif/algorithms/impl/MultiQueryWrapperAlgorithm.java
	messif/buckets/storage/impl/DiskStorage.java
	messif/objects/text/TextConversion.java
	messif/utility/Convert.java

* Added ignore-exception action modifier in CoreApplication config files

* Fixed multi-query wrapper algorithm constructor so that arguments can be filled from the application config file

	* Fixed thread-encapsulated references in instantiator

	* Added multi-object query algorithm wrapper
	* Added named-instance for threads to CoreApplication

* Added named-instance for threads to CoreApplication

 * a small modification in LocatorStorageAlgorithm

	* Added parametric column convertor

	* Added convertor multi-extractor encapsulation

 * removed an addAll(iterator it) method from SortedCOllection that caused non-standard behavior when updating answers
 * added a default implementation of LocalAbstractObjectParametric

* Added exception that allows to throw the objects rejected from the bulk-insertion

    * Added variable passing to controlFile method
    * Added support for closable extractors
    * Fixed invalid value matching in parametric regexp
    * Added constructor for ignoring specific object lines when reading MetaObjectArray from text stream

 * toString of LocatorStorageAlgorithm redefined
 * comment update in CoreApplication

* Fixed invalid value matching in parametric regexp

* Added constructor for ignoring specific object lines when reading MetaObjectArray from text stream

    * Updated text conversion methods so that the the processing steps are simpler and reusable
    * Added support for text descriptor factories
    * Added conversion interface and implemented basic conversion functionality for iterators and extractors
    * Extended support for converting objects in object streams
    * Added object key constructors to MetaObjectParametricArray hierarchy
    * Added support for restricting metaobject streams to the encapsulated object
    * Small fixes and a new constructor in MetaObjectMap
    * Added convenience methods for storing/reading a single object from a binary-serialized file
    * Fixed permissions problem with resource-stored extractor binary
    * Updated handling of parametric data to be more memory effective
    * Added support for copying resource files to local directory
    * Added support for using extractor contained in the resources (e.g. inside jar file)
    * Added collection that allows filtering using a parametric value
    * Fixed missing finalizer calls to locator storage encapsulated algorithm
    * Fixed control file action parameters to perform unquoting
    * Algorithm extractor handles not found objects with exception
    * Added support for creating multi-extractor from properties
    * Removed problematic vararg parameters in constructor
    * Documentation fixes
    * Added locator-storage wrapper algorithm for adding fast access-by-locator
    * Updated constructors of MetaObjectArray so that a map-text input can be used
    * Fixed problem with copying from data source with null source
    * Fixed handling of ranked objects in get-by-locators operation
    * Added support for duplicating existing named instance under a new name

* Added support for text descriptor factories
* Added conversion interface and implemented basic conversion functionality for iterators and extractors
* Extended support for converting objects in object streams
* Added object key constructors to MetaObjectParametricArray hierarchy

* Small fixes and a new constructor in MetaObjectMap
* Added convenience methods for storing/reading a single object from a binary-serialized file
* Fixed permissions problem with resource-stored extractor binary

    * Updated handling of parametric data to be more memory effective
    * Added support for copying resource files to local directory
    * Added support for using extractor contained in the resources (e.g. inside jar file)
    * Added collection that allows filtering using a parametric value
    * Fixed missing finalizer calls to locator storage encapsulated algorithm
    * Fixed control file action parameters to perform unquoting
    * Algorithm extractor handles not found objects with exception
    * Added support for creating multi-extractor from properties
    * Removed problematic vararg parameters in constructor
    * Documentation fixes
    * Added locator-storage wrapper algorithm for adding fast access-by-locator
    * Updated constructors of MetaObjectArray so that a map-text input can be used
    * Fixed problem with copying from data source with null source
    * Fixed handling of ranked objects in get-by-locators operation
    * Added support for duplicating existing named instance under a new name

* Added support for using extractor contained in the resources (e.g. inside jar file)
* Added collection that allows filtering using a parametric value

* Fixed control file action parameters to perform unquoting

* Documentation fixes

* Updated constructors of MetaObjectArray so that a map-text input can be used