Modified main.php controller
Bugfix version1.1 for production
resolve merge conflict
Edit notes completed coding