renamed Map to Floor, refactored DB import
finished database import
Merge branch 'tcuje' into dev