Merge remote-tracking branch 'rsa/tizen_2.1' into rsa_master