Merge branch 'refactoring'

Conflicts:
	container.py
	station.py
	update_ids.py
Merge branch 'master' of github.com:Balise42/skillbooks-hangar-monitor