Updates to the mysql files and the master.tpl