Conflicts: pandora_console/include/lib/User.php modified: pandora_console/include/api.php modified: pandora_console/include/chart_generator.php new file: pandora_console/include/lib/User.php modified: pandora_console/include/load_session.php modified: pandora_console/include/web2image.js