add slider  js framework
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbmigration/test.data/goods.data.xml