Added buttons for icons
Merge branch 'master' of https://github.com/Akenne/WatFood

Conflicts:
	src/ca/waterloo/watisfood/MapActivity.java