Bumps version number
Merge branch 'refs/heads/development'

Conflicts:
	style.css