add i.php
add dev var
add master var
Merge branch 'dev'

Conflicts:
	cron.php