Merge branch 'master' into mass_prepare
don't automatically add 'prepared for' users when adding a doc to be shared
move all document prepare links (add annotations) to share prepare screen
Merge branch 'mass_prepare' into testing