Creating template
Merging test/master into master.
Updating template search path.