Merge "FIoRegistry.h => iniparser.h" into tizen_2.2