Card #48 - Added visible column and Primary key fix
Merge remote-tracking branch 'origin/develop' into develop