commit
commit
Merge https://github.com/e9-dbeech/RepsUk

Conflicts:
	RepsUK.Web/App_Start/BundleConfig.cs
	RepsUK.Web/Areas/HelpPage/Views/Shared/_Layout.cshtml
	RepsUK.Web/RepsUK.Web.csproj
	RepsUK.Web/Scripts/_references.js
	RepsUK.Web/WebApp/app.js
	RepsUK.Web/WebApp/layout/sidebar.html
	RepsUK.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	RepsUK.v12.suo
commit
commit
Merge https://github.com/tarpitgrover/RepsUk

Conflicts:
	RepsUK.Web/WebApp/core.js
	RepsUK.v12.suo