Merge origin/master
Fixed cancel button.
Added edit button
Added manageSelection()
Pushing to upstream
Revert "Pushing to upstream"

This reverts commit 1745d08da0cee27828e0131fecf0f59a85159dd4.
Merge origin/master