merge of author edit/reorder functionality into dev

merge of author edit/reorder functionality into dev branch for deployment to dev