updated conn.php
Merge branch 'master' of https://github.com/JustForWL/agriculture_fr_new
Merge branch 'master' of https://github.com/JustForWL/agriculture_fr_new

Conflicts:
	conn.php
fix the issue