interim admob commit.  still has debug code.
Merge branch 'develop' of https://github.com/fandg/family into develop

Conflicts:
	family/src/com/fandg/santashuffle/Main.java
Cleaned up the ad code.