Update version
update version
Merge branch 'master' of github.com:Elao/rest-framework

Conflicts:
	package.json