Revert "Revert "Pre Integration""

This reverts commit 7c7bbdf922832150de07f23954ba0c5f7e516458.

Conflicts:
	boilerplate/js/main.js
	boilerplate/js/sparse_vector.js