added json settings to poll model - Fixes #33 - Fixes #34 - Fixes #32
Merge branch 'settings_charts' into develop