Added datepicker gem, and included it in app js and app css
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js