merge commit
Merge branch 'master' of https://github.com/quentoched/nytrip

Conflicts:
	app/View/Layouts/default.ctp

merge commit
delete cache