+ add FifthActivity
* conflicts
Merge branch 'master' of git@github.com:ChouSkim/FoodieAssistant.git

Conflicts:
	FoodieAssistant/bin/classes/com/mobileappdev/foodieassistant/MainActivity.class
	FoodieAssistant/bin/classes/com/mobileappdev/foodieassistant/R$id.class
	FoodieAssistant/bin/classes/com/mobileappdev/foodieassistant/R$layout.class
	FoodieAssistant/bin/classes/com/mobileappdev/foodieassistant/R$menu.class
	FoodieAssistant/bin/classes/com/mobileappdev/foodieassistant/R$string.class
	FoodieAssistant/bin/classes/com/mobileappdev/foodieassistant/R$style.class
	FoodieAssistant/gen/com/mobileappdev/foodieassistant/R.java
	FoodieAssistant/res/values/color.xml