AssemblyInfo changes

Changes from develop for release 1.0.0