i am develop_1 and the other guy is debuging in the same time
Merge branch 'master' into develop_1

Conflicts:
	index.php
solve the merge from master after debug