Convert boolean db types to strings
Merge branch 'master' of ../stage