Merge "fixed API reference" into tizen