o fixed

Conflicts:
	app/models/Location.scala