Updated
Updated
Merge branch 'master' of https://github.com/olof-82/OpenApi

Conflicts:
	src/main/java/com/cybercom/openapi/BackingBean.java