Change on a variable name for easy understanding.
check if template[term] isset
first round of resolving E+STRICT errors
update developer doc
Merge branch 'umaster' into cookieTimeout