Bumped version number
Merge branch 'develop'

Conflicts:
	fountain-mode.el
Merge branch 'develop'
Bumped version number