card
Merge branch 'card' of https://github.com/iamroger/voip into voice
merge