change rule
Merge branch 'master' of https://github.com/thanhtuyen/vaco

Conflicts:
	protected/models/Detailmenuimage.php
	protected/models/Imageslide.php
Merge branch 'master' of https://github.com/thanhtuyen/vaco
mimetype