services and statistics, including highcharts
- clean up
Merge commit 'ffc9061a29129e67f050d005fff3ccdf4acd270b' into room_control

Conflicts:
	cdtmmpd/cdtmmpd/settings.py
	cdtmmpd/cdtmmpd/urls.py
	cdtmmpd/hotel_services/models.py
	cdtmmpd/templates/base.html
- finalize merge