Fix version strings

Version strings all come from gradle now instead of being hard coded.
Merge remote-tracking branch 'upstream/master'