Merged Master into Ben

Daniel added database functionality.
Merge remote-tracking branch 'origin/master' into Ben
Merged Master in
background image
Merge remote-tracking branch 'origin/Ben'
Added background image