Layout tweaks
Merge branch 'master' of https://github.com/Magrit/miniature-ninja-agile-awesomeness

Conflicts:
	src/src/com/example/tson/SettingsFragment.java