Conflicts: installer/data/mysql/updatedatabase.pl Updated updatedatabase.pl to handle new version number