Merge pull request #662 from phofman/next

Projects merging and renaming