Edit nav2 and results show
Fix merge conflict
add modal and jquery ui
merge
Merge branch 'karinn' of https://github.com/TherapyLane/Rub_Me