Merge pull request #4 from albertsaave/master

Refactored controller to use service.
extract merge form fields to dao
extract getMatchingForms to service and refactor controller
Merge pull request #5 from Loos/master

refactor controller; extract methods to DAO
Implement update of name and description for programs