Bio (model, view, controller)
Link (controller)
Merge branch 'develop_mostrecent' into develop