* removed unused imports
 * removed template generated text
 * set UTF-8 as encoding
Merge origin/master