Merge branch 'master' into tizen2
Merge branch 'tizen2' of github.com:Meecast/meecast into tizen2