merge commit
Merge branch 'update_self_report' of https://github.com/elizabrock/coursewareofthefuture into feature
Reorder completed form caledar display/ edit self report