Added INI file lines from AR0130-REV1.ini

*UNTESTED* changes, since the sensor is currently at scs.ch
Tested settings for AR0130

And changed merge setting to default to --no-ff onto master branch
Merge branch 'initialize-ar0130'

Conflicts:
	aptina/MasterThesisIvan.ini