Merged rain-tpl branch, separating html and js from the php scripts. This breaks previous templates until they are converted.