create additional web services
Merge remote-tracking branch 'origin/master'

Conflicts:
	aliveTracker_ws/settings.py