a
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/assets/javascripts/settings.js.coffee
favicon.ico
l
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/views/billing/bill_email.html.haml
	config/environments/production.rb
Merge branch 'master' of github.com:kantoliinary/kantoliina
Merge branch 'master' of github.com:kantoliinary/kantoliina
laskupohja