Added bootstrap-datetimepicker to /vendor
Generated Schedule and Appointment models
Fix conditionals
Bundled geocoder
Requre bootstrap-datetimepicker in assets
Migrated bare Schedule/Appointment models
Some setup
Generated Conversation model
Removed partials/message
Alias User as customer and merchant on Conversation
Can check Conversation record for who needs to be notified of update
Removed body attribute from Conversations
Include FactoryGirl methods
Conversation and Message models with factories and validations
Went back to using body attribute on Conversations with array type
Disable test/unit
Added .redirect_back_or_to and fixed .redirect_back_or_to_root
Revert "Disable test/unit"

This reverts commit 574a87b887796f272c66ded9bfd320be8b5f36bd.
Removed needless lines
Fixed broken conditional preventing profile from being x-editable