Updating database
Merge remote-tracking branch 'upstream/master'
Update base URL & remove hard coded graphic links