Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added setup for composite content views, added test method templates
until product functionality is added
implementing scenarios for content view, but for now they will fail
read access tests, #297
content definition delete tests - there is different bug, #299
refactoring in content definition tests, added more scenarios
Merge remote-tracking branch 'upstream/master'
Merge pull request #316 from alda519/read_access_297

Read access tests 297
uncomment teardown
Merge pull request #318 from hhovsepy/master

added new scenarios, did refactoring