UI update
Merge branch 'master' of github.com:pkprosol/DowntownAlliance
Storyboard conflict
Merge branch 'master' of github.com:pkprosol/DowntownAlliance
Map resize