Changed EditRecipeActivity so that a recipe with a blank name, blank
procedure, or no ingredients is rejected
Merge branch 'master' of ssh://git@github.com/lagecamp/CMPUT301W13T02.git
Added some javadoc, change mainactivity and viewrecipeactivity to
implement View
Merge branch 'master' of
ssh://git@github.com/lagecamp/CMPUT301W13T02.git

Conflicts:
	Team2RecipeFinder/doc/allclasses-frame.html
	Team2RecipeFinder/doc/allclasses-noframe.html
	Team2RecipeFinder/doc/ca/ualberta/team2recipefinder/Recipe.html
	Team2RecipeFinder/doc/ca/ualberta/team2recipefinder/class-use/Recipe.html
	Team2RecipeFinder/doc/ca/ualberta/team2recipefinder/package-frame.html
	Team2RecipeFinder/doc/ca/ualberta/team2recipefinder/package-summary.html
	Team2RecipeFinder/doc/ca/ualberta/team2recipefinder/package-tree.html
	Team2RecipeFinder/doc/ca/ualberta/team2recipefinder/package-use.html
	Team2RecipeFinder/doc/constant-values.html
	Team2RecipeFinder/doc/deprecated-list.html
	Team2RecipeFinder/doc/help-doc.html
	Team2RecipeFinder/doc/index-files/index-1.html
	Team2RecipeFinder/doc/index-files/index-2.html
	Team2RecipeFinder/doc/index-files/index-3.html
	Team2RecipeFinder/doc/index-files/index-4.html
	Team2RecipeFinder/doc/index-files/index-5.html
	Team2RecipeFinder/doc/index-files/index-6.html
	Team2RecipeFinder/doc/index.html
	Team2RecipeFinder/doc/overview-tree.html
	Team2RecipeFinder/doc/serialized-form.html
	Team2RecipeFinder/src/ca/ualberta/team2recipefinder/RecipeModel.java