Add missing files from initial commit, centralize strings
Merge remote-tracking branch 'origin/master'