#660 - Removed because we don't need any more; as we will be just putting text value directly into there corresponding attributes.
#660 - Added the add And block and add Or block functionality.
Merge remote-tracking branch 'origin/t660' into t660