Merge branch 'hotfix/fixedBrokenRest'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Refactored some of the code.
Merge branch 'hotfix/refactor' into develop