rename form template to index
Merge remote-tracking branch 'origin/master'