updated version info, etc.
Merge branch 'develop'