Theme changes and offer edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineShopTime/OnlineShopTime/Views/Account/_ChangeAvatarPartial.cshtml