preparing for merge
Merge branch 'master' of github.com:npolar/api.npolar.no

Conflicts:
	load.rb