merging
re-enabling spree_print_invoice
setting branch
extraneous files
updating Gemfile.lock
database adapter
database adapter
database adapter
database adapter
invoicing
fixing repo
updating routes
Merge branch 'master' of github.com:Siesna/sfi into Siesna-master

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/spree/print_invoice_configuration.rb
	config/initializers/spree.rb
Renaming typo'd app_configuration.rb