Merge pull request #17 from RaymondKlass/Stage

Stage
Merge pull request #18 from RaymondKlass/Stage

bug fix and database restart.  Fixed issue of added apostraphe to some w...
Merge pull request #19 from RaymondKlass/master

up to date