change event attributes, set allDay default, edit related files
fix appointment request alert to only associate with relevant button
add nested resources
add console log to calendar
Edit Therapists results view
Add merge conflict changes
merge changes
adds links
fix conflict
fix timezone issue
Fix show conflict
Merge branch 'master' of https://github.com/TherapyLane/Rub_Me

merge
add geo search by location
Edit layout
Change layout
Merge branch 'master' of https://github.com/TherapyLane/Rub_Me into karinn

it.
merge
add nav bar text box
Add fb/twitter and twitter handles