Datepicker
Merge branch 'master' of https://github.com/Airwaver/SeaPal

Conflicts:
	SeaPal_Play/public/javascripts/app/map/map.js