Fixing updates.
Merge branch 'develop' into feature/scala_reflection
Merging license change.