Update router
Merge branch 'master' of https://github.com/ngxuanmui/9trip.vn

Conflicts:
	components/com_ntrip/helpers/route.php
	components/com_ntrip/views/discovers/tmpl/default.xml
	components/com_ntrip/views/hotels/tmpl/default.xml