Fix map condition
Insert QR code client-side instead of server-side
Change wording
Add tests that involve changing the settings

Settings can be changed using deep_merge!.
Remove padding-right from notes list

This was invoking horizontal scroll-bars.
Fix settings in rspec

Settings.reload can't be fired because it does not reload
Merge remote-tracking branch 'upstream/staging' into staging

Conflicts:
	app/views/layouts/application.html.slim
	spec/vcr_cassettes/model.yml