wipe and json

updated json and wipe
Merge branch 'master' of https://github.com/salamatmoali/adapt-test-package

Conflicts:
	build/adapt/js/adapt.min.js