Merge pull request #2 from paufsc/master

pull2
templates updated
Merge pull request #26 from ozgurince/master

Templates updated