Add set/expansion browsing
Merge branch 'master' of https://github.com/rtsuk/spacedock

Conflicts:
	android/app/src/main/java/com/funnyhatsoftware/spacedock/fragment/DisplaySquadFragment.java
Fix expansion detail display on phones