Merge branch 'master'

Conflicts:
ia03 copy/includes/connect_to_mysql.php