Update version info.
Add new *rpm.
Merge branch 'master' into phonecontrol