Comments that contains apostrophe now are correctly escaped in order to
avoid SQL related errors.

Minor fix on CLI menu.
Merge branch 'fix-bug-353' into develop