Merge "Flora license fixed" into tizen_2.1