Merge branch 'origin/master'
cms view layout-cshtml - important
contact view main site important
IMPORTANT:mainsite:views:details
IMPORTANT:mainsite:main.css
IMPORTANT:glyphicons fonts
csproj
IMPORTANT : main: views: cat: index
IMPORTANT: main:views:contact
Merge branch 'origin/ash'
Merge branch 'jon' c/o ash