Misc changes to the Domain layer
View changes
Merge branch 'master' of https://github.com/zxenlogics/WebSamples