merge develop into master (adds full img bg fix)