Eliminated non-strict '<?' PHP tags
Merge branch 'development' into dev/j2/common