doc + services splitting
Merge remote-tracking branch 'origin/stable'

Conflicts:
	doc/conf.py
	mc_states/modules/mc_shorewall.py