Merging SON for Hive

Prepare master, beatrice and develop branches for merging, and merge feature/son-for-hive into develop branch, develop into beatrice, beatrice into master.