Fix all dem conflicts,bump version
Fix missing files from master
Update admin-drivers