Merge pull request #8 from glodos/master

Update to 1.5
Update errors.xml

Update to 1.5
Update strings.xml

Update to 1.5
Merge pull request #138 from McGiverGim/master

Update to 1.5