Changed the combat and saving throws UI

Added ScrollViews to everything in order to prevent any scenario in
which an element may become inaccessible due to it being off the screen
Fixed more layout stuff in combat
Fixed the Character Creation UI
Merge branch 'Fixin'-Stuff'

Conflicts:
	MinionApp/res/layout/activity_char_create_main.xml
	MinionApp/res/layout/activity_edit_group.xml
	MinionApp/res/layout/activity_group_create.xml
	MinionApp/res/layout/activity_view_group.xml
	MinionApp/res/values/strings.xml