Merge remote-tracking branch 'origin/old-vec'

Conflicts:
	origin/data/CMakeLists.txt
	origin/data/vector.hpp