More progress on concept
Merge branch 'master' of ssh://github.com/csand/portal-concept