-Fixed bug with $replace
Merge branch 'master' of github.com:Inaimathi/cl-web-dev
-Added $aif/$awhen macros