Merge "Programming Guide Updates" into tizen