datepickers are done
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/ember/templates/cargos/new.emblem