Merge remote-tracking branch 'moc/devel' into switch_register/delete

Conflicts:
	haas/api.py
Merge pull request #139 from zenhack/switch_register/delete

Switch register/delete
Merge branch 'devel' into connect_network

Conflicts:
	haas/api.py