Template integration

and fully merged template to application