Merge branch 'starline' of github.com:polar/buspass-models

Conflicts:
	network_progress.rb
Merge branch 'master' of github.com:polar/buspass-models