Fixed conversion factor Centimeters to Pixels and vice versa.
Fix unit test for px2cm and cm2px conversion
Merge branch '#233-basjan' into develop