labels appear when text is in the form inputs.
revised version, now without animation
Merge pull request #43 from CG-CamSys/132-to-from-labels

labels appear when text is in the form inputs.
Merge branch 'cgdevelop' into 110-default-map-to-current-location

Conflicts:
	app/views/trips/_trip_form.html.haml