Bumped parent version, and generalized resource inclusion in the parent.  Resource includes are not merged in the inhertance so it makes more sense to keep all this in the parent.
Bumped parent version, and generalized resource inclusion in the parent.  Resource includes are not merged in the inhertance so it makes more sense to keep all this in the parent.


git-svn-id: 8ebed0c25533aaea68ca43268d4d516467f97e6a@6707 6e01202a-0783-4428-890a-84243c50cc2b

concord-consortium/otrunk,concord-consortium/otrunk