fix
fix
Merge branch 'master' of https://github.com/PouyaDarabi/Dynamic

Conflicts:
	index.php
fix