Fixed warnings
Fixed warnings
Merge branch 'master' into tizen2