Commit 82b7cb7b authored by Bryan  BRANCOTTE's avatar Bryan BRANCOTTE

Merge branch 'live-settings' into 'master'

Live settings

Closes #147

See merge request !31
parents d86b61fe d8ff1df5