Upped version number to 2.8.0
Upped version number to 2.9.0
Merge branch 'develop'