Merge branch 'release/2.3.6' into develop
fixed date picker and alerts
Rails 4.0.1 upgrade
release 2.3.7
Merge branch 'release/2.3.7'