Pull in Aloshi#546

This is an issue to track pulling in the PR for DB support and evaluate that. We'll pull this into a branch first and then evaluate for merging into master.

PR: https://github.com/Aloshi/EmulationStation/pull/546
