defined template view and template path.
Renamed aaf_options to jsOptions (more user-friendly)
Merge remote-tracking branch 'origin/master'