added background image
merge master, added background image
app/