upload for nhi
Merge branch 'khoabranch' of https://github.com/tranlannhi/DayTrip into khoabranch

Conflicts:
	log/development.log
Merge branch 'master' into khoabranch

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2525cad450c5ef0c03ce6702fdf8e7e8
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/52c382c44c2b5e3ab83b48ea0b27c309
	tmp/cache/assets/development/sprockets/9f79236dce892cd94637388f05e25f4f
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655

merge again
Merge branch 'khoabranch'

merge again