Merge branch 'i3-remap-experimental' into development

i3/config

@@ -303,7 +303,9 @@ bindsym $mod+$mod_next+Tab move container to workspace back_and_forth; workspace
 # switch to workspace
 bindsym $mod+1 workspace prev
 bindsym $mod+2 workspace next
-bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -P "Goto Workspace: " -l 2 -F 'workspace number "%s"'
+bindsym $mod+3 exec --no-startup-id i3-input -f $i3inputfont -P "Go to Workspace: " -l 2 -F 'workspace number "%s"'
+bindsym $mod+Shift+3 exec --no-startup-id i3-input -f $i3inputfont -P "Move to Workspace: " -l 2 -F 'move container to workspace number "%s"'
+bindsym $mod+$mod_next+3 exec --no-startup-id "i3-input -f $i3inputfont -P \\"Move with Workspace: \\" -l 2 -F 'move container to workspace number \\"%s\\", workspace number \\"%s\\"'"
 bindsym $mod+4 exec --no-startup-id i3-input -f $i3inputfont -P "Rename Workspace: " -F 'rename workspace to "%s"'
 
 # new iterative workspaces