Merge branch 'issue/96-list-fragment' into issue/63-fragments

Conflicts:
	gradle/android/src/main/java/bbct/android/common/activity/MainActivity.java