Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of github.com:coders-kitchen/CDIProperties into develop
Fixed loading of resource in case of ear deployment and introduced cache control system property
Merge branch 'develop'
Merge branch 'master' of github.com:coders-kitchen/CDIProperties