Merge CreateRecipeActivity and RecipeDetailActivity.

Conflicts:
	res/layout/activity_recipe_detail.xml
	src/com/codepath/beacon/activity/CreateRecipeActivity.java
	src/com/codepath/beacon/activity/RecipeDetailActivity.java
	src/com/codepath/beacon/adapter/RecipeArrayAdapter.java
	src/com/codepath/beacon/fragments/RecipeEditDetailFragment.java
fixed merge problem for detail activity UI
Merge CreateRecipeActivity and RecipeDetailActivity.

Conflicts:
	res/layout/activity_recipe_detail.xml
	src/com/codepath/beacon/activity/CreateRecipeActivity.java
	src/com/codepath/beacon/activity/RecipeDetailActivity.java
	src/com/codepath/beacon/adapter/RecipeArrayAdapter.java
	src/com/codepath/beacon/fragments/RecipeEditDetailFragment.java
fixed merge problem for detail activity UI
Merge branch 'rcao_dev2' of https://github.com/richk/ProjectBeacon into rcao_dev2