Changes made by Yoanna Mareva (jo.thirdeyevision@gmail.com).
Merge branch 'master' of https://github.com/elfoles/ENIGMA-Telerik-Hackathon-DreamProject.git
Merge branch 'master' of https://github.com/elfoles/ENIGMA-Telerik-Hackathon-DreamProject.git
Changes made by Yoanna Mareva (jo.thirdeyevision@gmail.com).
Merge branch 'master' of https://github.com/elfoles/ENIGMA-Telerik-Hackathon-DreamProject.git