Remove redundant xml file and update code.
Put a proper placeholder for meme view
Merge remote-tracking branch 'origin/master'