index ,controller
Merge branch 'map'

Conflicts:
	app/View/Diaries/index.ctp
sua