<<<<<<< HEAD ======= >>>>>>> 1c93d0d... Moved a lot templates areound: