Merge branch 'master' of https://github.com/yboukhata/smartModel

Conflicts:
	tests/test-attribute.js
Merge branch 'master' of https://github.com/yboukhata/smartModel

Conflicts:
	tests/test-attribute.js