0.5 update
Merge remote-tracking branch 'origin/master'

Conflicts:
	dest/smart-dataManager.js
	dest/smart-dataManager.min.js
	dest/smart.min.js
0.5update