Experimenting with branches more
Removed version numbering in features.
Merge branch 'develop'

More experimentation with the merge functionality.