Bootstrap returns!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/Shared/_Layout.cshtml
	Views/Shared/_LoginPartial.cshtml
Merge remote-tracking branch 'origin/master'

Conflicts:
	Views/Shared/_Layout.cshtml
	Views/Shared/_LoginPartial.cshtml