fix compositeId bugs.
resolve conflict.
Merge branch 'master' of
https://github.com/bingo-open-source/bingo-odata.git

Conflicts:
	odata-consumer/src/main/java/bingo/odata/consumer/ODataConsumer.java
	odata-consumer/src/main/java/bingo/odata/consumer/ODataConsumerImpl.java
	odata-consumer/src/main/java/bingo/odata/consumer/util/ODataConsumerContextHelper.java
	odata-consumer/src/test/java/bingo/odata/consumer/ODataConsumerImplTest.java