#611 settings now converted to json blobs and only loaded on app fresh start
Merge branch 'feature-20141014-new-server' into 20140401-dev-stable