More btc
Merge remote-tracking branch 'origin/btc' into btc

Conflicts:
	edvd-web/src/main/java/no/gnet/edvd/web/controller/BTCController.java