Revert "Revert "Upgrade to xtext2.4 (again)""

This reverts commit 5143d0988ac79b32bce9a4dd7db4d395bc66a0ab.
Fix a minor issue with abdera dependency in useragent-examples-simple/pom.xml
One minor change to the comments in hal repository dependencies.
fixes #65 initial implementation of extended odata consumer (for bag / complex type support) that supports getEntities
Organise imports
Merge branch 'master' into xtext2.4-dev

Conflicts:
	interaction-media-hal/pom.xml
	interaction-odata4j-ext/src/main/java/org/odata4j/jersey/consumer/ODataJerseyConsumerExt.java
	useragent-examples/T24-ft-useragent-javascript/.project
Merge commit 'e7c43797ac70969187a30559481836827b085928' into xtext2.4-dev
OData Filter:
1. OptionsQueryParserExt.java and TestOptionsQueryParserExt.java class added to fix the System query filter options.
2. Now GETEntitiesCommand/GETEntityCommand and GETNavPropertyCommand will use OptionsQueryParserExt
3. Unit test added for OptionsQueryParserExt
Merge remote-tracking branch 'upstream/master' into load-metadata-dynamically
dynamically load metadata functionality added according to entity name, unit test & test inquiry metadata files added
Fixed unit tests and added some entity xml files
commands updated, fixed some test, new constructor added in AtomXMLProvider
code clean up
update interaction-example spring beans to change the constructor arguments
fixed some unit tests
load metadata.xml in case if missing metadata-<entityName>.xml
Merge remote-tracking branch 'upstream/master' into load-metadata-dynamically
remove unwanted dependency
Merge remote-tracking branch 'upstream/master' into load-metadata-dynamically
test file added