switching branches
Merge remote-tracking branch 'upstream/master'
added datepicker to programs form
Merge branch 'dev'
non-admin org-users can view their programs
Merge pull request #126 from jschiang/master

added datepicker to program form and nonadmin org users can see their programs