Merge pull request #1 from adlnet/master

get commits from adl master
Merge pull request #2 from adlnet/master

get commits from adl master
Changed Sub-Statement to SubStatement when reffering to objectType
Merge pull request #410 from garemoko/substatement

Use Substatement instead of Sub-statement for objecttype