Fixed Merge Conflicts.
Merge branch 'master' of https://github.com/Grollo/RobotStudioNLP.git
Alot of work has been done.