Once again
Merge branch 'master' of https://github.com/androidpoker/androidpoker
Fix package names
Merge branch 'master' of https://github.com/androidpoker/androidpoker