Merge branch 'backbone_upgrade' of https://github.com/miahal7/finances into backbone_upgrade

Conflicts:
	app/controllers/transactions_controller.rb
Transaction controller merge
Merge branch 'backbone_upgrade' of https://github.com/miahal7/finances into backbone_upgrade

Conflicts:
	app/controllers/transactions_controller.rb
transaction_controller conflict resolution