2nd modify b.java- chh_5
Merge branch 'master' of https://github.com/challenh/ODataSample1 into chh_3

Conflicts:
	b.java

merge b.java into chh_3 from master which is from chh_5