fixed lexical error after merge
updated project settings and add Tizen to target platforms