removed few macros and moved the functionality to inline functions
Merge remote-tracking branch 'origin/master'
1) fixed sentence display when string is empty

2) using shared_ptr in Messages