Adding .idea to gitignore
Fixing merge
Merging
SUNSHINE-5 Setting up confimartion dialog
Workspace.xml
SUNSHINE-5 Finished launch confirmation dialog directive
SUNSHINE-5 Cleaning up code, removing some comments
SUNSHINE-5 Updating launchcodetoolbox version