branch commit of tasks params
resloved merge conflict in tasks controller
updates to users form and routes