Add info about Semantic Versioning to README.md.
Updated branch naming conventions

Updated branch naming conventions to ones agreed on 14.10.
Merge branch 'master' into integration