rich text editor working in email modal
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges

Conflicts:
	app/assets/stylesheets/invoice_style.css
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges
added paper_trail gem and revert action for customers in admin page(activity feed)
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges
Added reccurrent notifications
Merged conflicts
Removed heroku from Gemfile - not needed
added revert action for admin activity feed on updating an user's job
Cleaned-up menu bar
Code for modal view for Financial Reconcile Invoice
Updates to Account Manager / Customer View
Updates to New Invoice page
Admin Add Users Modal code
Merge w/ Remote Master
Merge branch 'master' of https://bitbucket.org/alexandru_paduraru/invoiceflow.com into ViewsChanges