Fixed inconsistent usage of elseif

In the past, elseif was used within templates. Now, you've mixed up the
usage of else if and elseif.
Merge pull request #1291 from SoftCreatR/consistentElseIf

Fixed inconsistent usage of elseif