formatting
Merge branch 'master' of https://github.com/cimar/maplight_1.0
fixed

daonflicts:
	app/controllers/CaliforniaController.java