Added mailbox gem and config for development env
Generated mailboxer migrations and ran them. Also fixed up some database errors (not part of a commit)
Prepared the user model for mailboxer messaging
Added messages controller and conversations controller as well as resource routes for both. Current implementation is just a copy from the example with minor changes. Need some tuning as well as views before it will work.
Fixed a bug in development configuration. Fixed a bug in user.rb. Updated conversations controller (still not fully functional)
resolve merge conflicts
add basic inbox scaffolding, edit spacing
Made some modifications to sample views and created new view
Merge branch 'ft_messaging_mailboxer' of https://github.com/japacible/commission-me into ft_messaging_mailbox
Worked on my branch and forgot to commit over night
Deleted message.rb which was redundant (mailboxer has a 'built in' message model)
new message modal dialog
Hooked up message sending via messages#new, hooked up conversations#index, started working on conversations#show. Currently needs a lot of polishing. Also disabled email notifications for now because it was slowing down message sending a lot.
Moved show action into a tab instead of modal. Reply button still doesn't work, may need to rethink new_message design functionality before implementing it
Sucked it up and added javascript to implement reply. Reply is now functional.
Fixed up most of what was mentioned in code reviews
-Fixed some indentation
-Improved aesthetics of errors (still no in-modal dialog errors to prevent user losing message)
-Removed some commented lines of code
-Removed .swp file
-Removed some outdated unused files
-Removed some blank lines
-Added some conversation viewing security
Merge branch 'ft_messaging_mailbox'

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/message.rb
	db/schema.rb

Fixed Gemfile by hand
Fixed Gemfile.lock by hand
Removed app/models/message.rb (unused)
Regenerated schema using rake db:schema:dump

Did an abysmally small (like that guy from Return of Jafar) amount of testing to
'ensure' everything worked.