before merge pull TestJsonFilterStr.java
Merge branch 'master' of github.com:samarjit/newfrbe

Conflicts:
	src/test/java/TestJsonFilterStr.java
widget data added