c_1
c_2
h_1
c_3
c_4
h_2
Merge branch 'hotfix' into computing_center

Conflicts:
	computing_center.c
Merge branch 'computing_center'