Merge remote-tracking branch 'origin/dev_isar'

Conflicts:
	cart.rb
	init.rb