Fixed gcc warnings
Merge branch 'master' into tizen2
Fixed gcc warnings
Merged
Fixed gcc warnings