updated
Merge branch 'master' of https://github.com/XiaolanLin/ODATAAPI

Conflicts:
	example.xml