Mergeloading/mainintotemplates/main

10 files changed
+632
-54