Updated all strings inside layout files to @string/
Merge remote-tracking branch 'origin/master'