Fix #1334 PHP Notice: Undefined variable: category 
Merge remote branch 'upstream/master'
Add gitignore for less-generated css file
Fix dates in template manager if using GIT repository
Merge pull request #1355 from mahagr/master

Fix #1334, modify gitignore, fix dates in template manager if using GIT repository