added drawable folder and removed the other drawable folders
Merge branch 'master' of https://github.com/Mondobot/Food-Friendly

Conflicts:
	app/src/main/java/com/example/demouser/foodfriendly/MainMap.java
	app/src/main/res/values/strings.xml