change Message to package com.discovery.service.message...
Merge branch 'dev' into chong