Fixing conflicts on somanet base
Changing somanet base to develop branch