added fake store for testing (was local_store)
further work on re-factor of buffers
Style fix
Merge branch 'next' into buffer_cleanup
Disable 4702: unreachable code, before boost::future include.