Adding files for 1a2
Finishing 1a2
Finishing 1a2
Fixing build of the template project