Uppdatering av jQueryUI, Re-install av Bootstrap, Generic ViewModel
Merge remote-tracking branch 'origin/Guide-admin'

Conflicts:
	TemaResor/Migrations/Configuration.cs
	TemaResor/Models/TemaTrip.cs

Mergat mot master