Added new ClientServer scenario
Modified PublishSubscribe scenario
Modified Generator to handle possible apptypes in action generation