Added the can_edit check to the upload media button #571
-Added link back for #567
Merge pull request #623 from mmcguinn/scratch

-Added link back for #567
Fix for issue #611
Merge pull request #622 from jdalphon/uploadMediaButton

Added the can_edit check to the upload media button
Merge pull request #624 from jdalphon/jd_issue611

Removed outer button tag