edit detalis page
Merge branch 'master' of https://github.com/MMITeam/Ya3bad-Project

Conflicts:
	application/views/main.php
d
fix conflict