error checking
Merge branch 'master' of https://github.com/kondratovlabs/wonder.git

Conflicts:
	Frameworks/EOF/ERRest/Sources/er/rest/format/ERXRestFormatDelegate.java