add in dev
modify index.php dev2
merge with no-ff