bump master version to 2.6.0

Bumping master version to 2.6.0
Adding 2.6.0 changes to history