Fix for CBTemplate
Merge branch 'master' of git://github.com/abduallah/agar