Merge branch 'devel' into issue107-fix
Merge branch 'devel' into issue107-fix

Conflicts:
	android/common/lib/src/bbct/android/common/activity/BaseballCardList.java
Issue #107: Remove unused method `getBaseballCard()`
Issue #107: Fix whitespace error