Add Canon EOS 1200D.
Add Canon PowerShot G1 X Mark II
Fix Nikon D5300 blackpoint handling
Add Nikon D3300
Various Sony ILCE changes

Fix SONY ILCE-3000 cropbox
Add SONY ILCE-5000
Add SONY ILCE-6000
Fix SONY ILCE-7 cropbox
Fix SONY ILCE-7R cropbox
Add Olympus E-M10
Various Samsung NX fixes

Move Samsung NX5 to the top
Add Samsung NX1100
Add Samsung Galaxy NX (EK-GN120)
Fix Samsung NX gen 2.5 (NX300/NX30/NX2000/EK-GN120) cropbox [1]

[1] Samsung seems to place the sensor asymetrically in the camera
body, where the body crops off a fairly large chunk of the left
side of the sensor. So we adjust the cropbox so the exact centre
of the image remains the same as the camera JPEG output, then we
grow the camera crow according to a 3:2 aspect ratio and stop
before we start including garbage pixels.
I've already fixed this for the gen 1 (NX100, etc) cameras, and
now for gen 2.5 (NX300, etc), this leaves gen 2 (NX200, etc)
cameras, for which I don't have any usable samples yet.
Samsung NX 2nd gen centered cropboxes

it seems unlike the 1st gen and 2.5nd gen, the 2nd gen Samsung NX
sensors do not leave room for a 3:2 cropbox properly centered without
hitting garbage pixels beyond the vendor defined resolution.
Merge pull request #1 from pmjdebruijn/master

camera.xml additions and fixes from darktable
Merge remote-tracking branch 'upstream/master' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Fix Fuji X100
Add preliminary support for Canon PowerShot S120
Merge pull request #18 from pmjdebruijn/develop

Fuji X100 / Canon S120