include version string
only add branch to version string if not in master
Merge pull request #378 from OlegHahm/version_string

include version string