Modify two template.
Fix a bug.
Merge branch 'master' of ssh://github.com/donilan/genthemall
Fix a big bug.