Moved store_subview_t to its own header.
Merge branch 'next' into sam_2000

Conflicts:
	src/store_view.hpp
Merge branch 'next' into sam_2000
Merge branch 'sam_2000' into next