Updated gems
Remove unused code
Convert to new invoice status report
Update wording
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	app/models/invoice.rb