Merge branch 'master' of github.com:alexeygoder/model-objects
Merge branch 'master' of github.com:calpath/model-objects
Merge branch 'master' of github.com:gunesder/model-objects
Merge branch 'master' of github.com:calpath/model-objects
Adding new network schema
Merge pull request #50 from mnjuhn/master

correcting JAXB schema issue for some updates of java and adding locks to network