Name Change

Name change with some other stuff
change
Merge remote-tracking branch 'origin/master'

Conflicts:
	dropbox-sideload.php
Revert "change"

This reverts commit 7917947a631650625d4c3d59fd8278b8b96807a6.
Revert "Revert "change""

This reverts commit 08aa69195d34febd1e386a6e08b240179dce82bc.