replace js scrollspy test for default behavior
Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test

Conflicts:
	js/tests/unit/scrollspy.js
Merge branch 'breaddevil-replace-scrollspy-default-behavior-test'