rename to Callerid Number
fix epel to use i386 if arch is i686
Merge branch 'develop' into billing