Merge from API branch

Updates to match release of API version 1 on cognicity-server.