Adding keys.xml template file.
Permissions cleanup
Merge remote-tracking branch 'origin/master'