merge https://github.com/Telecommunication-Telemedia-Assessment/avrateNG/tree/samviq to new cleaned up templates