Updates
Merge branch 'master' of https://github.com/Da-Fecto/FieldtypeJson

Conflicts:
	FieldtypeJson.module
	InputfieldJson.module