Merge develop to master for release of user guide