modi
modi
modi
Merge remote-tracking branch 'origin'

Conflicts:
	WebContent/application/controllers/dev3.php

not IP address but absolute path