Merge branch 'release/7.x-0.2' into develop
test cleanup: comment out failing tests
add include to unit test
updated to version 7.x-0.3
Merge branch 'release/7.x-0.3'