Remapping of db
Merge branch 'master' of https://github.com/Darth-Terabyte/MWR_BYOD_V2.git