Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/pointa/service/ads/AdMobAdProvider.java
	src/com/pointa/service/ads/AdsAdapter.java
	src/com/pointa/service/ads/MockAdsProvider.java