SettingDetail
SettingDetail
Merge branch 'master' of https://github.com/Irteam/Mogger-GUI into Irteam-master

Conflicts:
	src/SettingsActivity.java
settings
Merge branch 'Irteam-master'

merge od Jakuba