adding to index
Merge remote-tracking branch 'origin/master'

Conflicts:
	tests/qunit_test.html
minified