Resolved conflicts: pandora_console/extras/pandoradb_migrate_5.1_to_6.0.mysql.sql pandora_console/extras/pandoradb_migrate_5.1_to_6.0.oracle.sql pandora_console/extras/pandoradb_migrate_5.1_to_6.0.postgreSQL.sql pandora_console/include/styles/pandora.css