cleaned up layout and drawable files
Merge remote-tracking branch 'origin/master'
cleaned up layout and drawable files