please review this one carefully 

- it's merging 3 commits

One which was to correct a conflict. I don't know how the conflict happened, so I don't really know what I was correcting.

Also added shortcut icon to template/index.php - would be nice for this to be in com_battle