Merge branch 'master' of https://github.com/AlexBasile/REST_Python_Ippocrate

Conflicts:
	REST_Python_Ippocrate.py
	conn_calendar.py
Merge remote-tracking branch 'origin/master'