add extra images back to app
Merge remote-tracking branch 'project/karinn'

merge latest changes
add client view of calendar
Merge branch 'karinn' of https://github.com/TherapyLane/Rub_Me

merge
Add new button to login page
add client calendar to therapist show page
adjust typos in mailer
add services and descriptions to model
Move gmap to top and adjust therapist results
Merge branch 'master' of https://github.com/TherapyLane/Rub_Me into karinn

merge