re DE3000 update dependency on evenmachine from an implicit 1.0.0 to an explicit 1.0.3 (based on advice from http://stackoverflow.com/questions/17606997/copycopter-server-crashing-on-heroku-rails and https://github.com/copycopter/copycopter-server/issues/86) and "thin server (0.0.0.0:3001): symbol lookup error: /vol/jenkins/workspace/vendors/ruby/2.0.0/gems/eventmachine-1.0.0/lib/rubyeventmachine.so: undefined symbol: rb_enable_interrupt" in thin.log for the admin
DE3000 do not use capistrano to deploy the databrowser on the cislaves
Merge branch 'master' into de3000_ruby2_second_attempt
Revert "DE3000 do not use capistrano to deploy the databrowser on the cislaves"

This reverts commit 466f49139a11741a5fee29b4b5b61dd2ded95a91.
Merge branch 'master' into de3000_ruby2_second_attempt
Merge branch 'master' into de3000_ruby2_second_attempt
Merge branch 'master' into de3000_ruby2_second_attempt
Additional test coverage for EntityDateHelper
Ruggedized isPastOrCurrentDate.
Fixed merge conflict.
Merge branch 'master' of github.com:inbloomdev/datastore into f314a