fixed merge issue
update and merge
various fixes
updated offer page
merge with develop