Merge
MessageModel constructor changed
CronJobController merge