update database written on controller
Merge branch 'master' into chartim
update form now populating values
merge complete