view2 almost done Casper&Henrik
Merge branch 'master' of https://github.com/danieljensen1987/ca4-meanWiki