support repos with spaces
Merge remote-tracking branch 'upstream/master'
refactoring content view definitions
Merge pull request #336 from hhovsepy/master

refactoring content view definitions , some fixes