done in the noon, finish the create recipe function
Merge branch 'develop' of github.com:AdvancedTraining1/NourritureTeam16 into develop

Conflicts:
	public/angularController/recipeController.js
	public/css/bootstrap_chenmm1.css
	public/upload/1417660337380.png
	public/upload/1417660607038.png
	public/upload/1417660709007.png
	public/upload/1417661046911.png
	public/upload/1417668200269.png
	public/upload/1417668282166.png
	views/common/index.html
	views/common/layout.jade
	views/recipe/createRecipe.html
	views/recipe/createRecipe.jade
	views/recipe/listRecipe.html