Fix nil template warning in atom.xml
Merge pull request #61 from trongdong/master

Fix nil template warning in atom.xml
Merge remote-tracking branch 'upstream/master'