Merge branch 'master' into Recipe-Selection
Fixed dead navigation on Category, updated selection activity
Merge branch 'Recipe-Selection'