Fixed GCC's warnings
Merge branch 'master' into tizen2
 Fixed GCC's warnings