Fix ignored files.
Fix merge issue with zukita version in string.xml