Merge git+ssh://github.com/gnss-sdr/gnss-sdr into next

Conflicts:
	CMakeLists.txt
Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.