Merge remote-tracking branch 'origin/master' into with-vagrant-box

# Conflicts:
#	README.md

Author: MaXal

README.md

@@ -4,7 +4,7 @@
 
 In these materials, you'll learn about many of the features and productivity tools available in [PhpStorm](http://www.jetbrains.com/phpstorm) IDE. Examples are navigation, editing, inspections, live templates, refactoring, tools like Composer and the REST client and many more things. It's virtually impossible to cover every option and feature in PhpStorm, but we're providing a number of practical exercises on how we can do our daily work as a PHP developer.
 
-We'll also cover a vast amount of keyboard shortcuts to make working with PhpStorm more efficient. Other IntelliJ IDEA based IDE's use the same keyboard shortcuts, so if you know how to work with PhpStorm, you'll know how to work with WebStorm, RubyMine, PyCharm, IntelliJ IDEA and more. A [cheat sheet is available online](http://bit.ly/phpstorm-shortcuts) and is also included in the workshop download.
+We'll also cover a vast amount of keyboard shortcuts to make working with PhpStorm more efficient. Other IntelliJ IDEA based IDE's use the same keyboard shortcuts, so if you know how to work with PhpStorm, you'll know how to work with WebStorm, RubyMine, PyCharm, IntelliJ IDEA and more. A [cheat sheet is available online](http://bit.ly/1Ni0XJ0) and is also included in the workshop download.
 
 This workshop is self-paced, meaning you can work your way through slides and exercises on your own, whenever and wherever you want. Exercises come as a PhpStorm project in which every file is a new exercise that may contain code and tips to get things done.
 
@@ -14,7 +14,7 @@ This workshop is self-paced, meaning you can work your way through slides and ex
 * VirtualBox: 5.*+
 * PhpStorm 11+
 
-## Getting the project
+## Getting the Project
 There are a couple of ways to get started with the PhpStorm workshop materials:
 
 * Create a new project using Composer. Note that you can also create a new project in PhpStorm and use the Composer project type and search for "jetbrains/phpstorm-workshop"
@@ -29,13 +29,15 @@ There are a couple of ways to get started with the PhpStorm workshop materials:
 
     ``wget https://github.com/JetBrains/phpstorm-workshop/archive/master.zip``
 
-## Getting started
-
+## Getting Started
 Most exercises require to have Vagrant box running. You may start it using *Tools->Vagrant->Up* inside PhpStorm.
 
 There are some things to know about the project:
 
 * The project can be opened as-is in PhpStorm. We've included configurations for PHP Remote Interpreter, Database, Deployment Server, PHP Web Debug, PHPUnit and Behat.
 * All numbered folders contain exercises that you can work on. Simply open the numbered files one by one and follow the comments in the file. Most exercises are self-contained, others build on previous exercises.
 * The PhpStorm Workshop.pptx / PhpStorm Workshop.pdf is a slide deck which summarizes many of the items covered in exercises.
-* The PhpStorm Reference Card.pdf is the PhpStorm keymap. The latest version can always be found on the [PhpStorm website](http://bit.ly/phpstorm-shortcuts).
+* The PhpStorm Reference Card.pdf is the PhpStorm keymap. The latest version can always be found on the [PhpStorm website](http://bit.ly/1Ni0XJ0).
+
+## Open Source and Contribution
+The workshop is Open Source, licensed under the Apache 2 license. If you would like to contribute to the workshop materials, please feel free to fork the repo and send us a pull request. Or if you have a comment, question, or suggestion for improvements, please [raise an issue](https://github.com/JetBrains/phpstorm-workshop/issues).

composer.json

@@ -6,8 +6,8 @@
     "type": "project",
     "authors": [
         {
-            "name": "Maarten Balliauw",
-            "email": "maarten.balliauw@jetbrains.com"
+            "name": "Maksim Kolmakov",
+            "email": "maxim.kolmakov@jetbrains.com"
         }
     ]
 }