Merge pull request #335 from hhovsepy/master

fixed failing tests, some refactorings
fixing failed tests
fixing tests: cli/SystemTests.java
Merge remote-tracking branch 'upstream/master'
refactoring content view definitions