skillz modified
Skillz updated
Merge branch 'master' into Petter_Week24_devBranch

Conflicts:
	WebBox.Domain/Migrations/Configuration.cs
	WebBox.Web/Views/Home/Expertise.cshtml
	WebBox.Web/Views/Profile/Details.cshtml
Added Postal-nugetpackage
Merge branch 'John_DevBranch_Week24_Presentation'

Conflicts:
	WebBox.Web/Views/Profile/Details.cshtml
fix after merge
Fixed UserLink rating. Once per user. Try.
UserLink vote woks. Do so that vote updates instead of error.
Merge branch 'John_DevBranch_Week24_Presentation' into Publish_Week_25
Merge branch 'master' into Publish_Week_25
Merge branch 'John_DevBranch_Week24_Presentation' into Publish_Week_25
js file Update
Merge branch 'Stellan_DevBranch_Week24_Presentation_Old_DB_2' into John_DevBranch_Week24_Presentation
Merge branch 'John_DevBranch_Week24_Presentation' into Publish_Week_25
Merge branch 'Publish_Week_25'

Conflicts:
	WebBox.Web/Scripts/MyScripts/Loader.js
small bugs and index
Added mvc.Sitemap package. Enabled Breadcrumbs. Moved breadcrumbs to Partialview moved search box to same partial as breadcrumbs.
moved the breadcrumbs and search into main content.////OBS bread crumb paths are now edited in the MVC Site map in the webBox Root directory.
Not in the Views!!