table and form template added
change masterMerge branch 'master' into LocationTemplate