ajax call
updated template
Merge branch 'tony'
Updating master template
fixed merge  conflicts