removing binding.pry from debugging session
Merge branch 'master' of npathway.com:wulin_master
Merge branch 'master' of github.com:Gabey/wulin_master
fix edit form hasManyEditor, fix default option of time picker