add kashmir and karmacoin
add bitstar
Merge branch 'master' into enhancement/use-markets-stored-in-rethink

Conflicts:
	app/models/coin.rb