ADD MapFactory and new DAO system
Merge origin/master