Bumps version number (oops)
Merge branch 'development'