Controllers
Merge branch 'master' of https://github.com/Loafgoof/BokningsiteResturang.git
Revert "Merge branch 'master' of https://github.com/Loafgoof/BokningsiteResturang.git"

This reverts commit a83c68da93cb3d6675325d5c02b5a63b1b2ac6a2.
Merge remote-tracking branch 'origin/master'

Conflicts:
	BokningssiteResturang.v12.suo
	BokningssiteResturang/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache