Edit Recipe Search mix rate/pin Fn
Merge branch Conflict

Conflicts:
	WebContent/WEB-INF/nav_menu.jsp
	WebContent/showStar.jsp