Deleted some xml's from src/main/res/menu  (they were wrongly created, shouldn't be there)
Merge remote-tracking branch 'origin/master'