Merge branch 'master' of git://github.com/polar/buspass-models
Merge branch 'starline'
Network compiler fix Routes == 0
Network compiler fix Routes == 0
Merge branch 'starline'
Merge branch 'starline'
Merge branch 'master' of github.com:polar/buspass-models
Merge branch 'starline' of github.com:polar/buspass-models
Merge branch 'starline' of github.com:polar/buspass-models
Merge branch 'master' of github.com:polar/buspass-models
Merge branch 'starline' of github.com:polar/buspass-models
Merge branch 'starline' of github.com:polar/buspass-models
Merge branch 'starline' of github.com:polar/buspass-models
Merge branch 'master' of github.com:polar/buspass-models
Merge branch 'starline' of github.com:polar/buspass-models

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

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