Fixed KBT #165 and #185

Fixed
Removed wrong mobile template file name
Fixed attribute names
Merge pull request #1173 from Undercova/master

Merge
Merge pull request #13 from ProjectSWGCore/master

pull