Merge pull request #1 from Irteam/master

tzi
Nastaveni, vyber, klikani na prehrani
Nastaveni, vyber, klikani na prehrani
Nastaveni, vyber, klikani na prehrani
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
Merge pull request #2 from Irteam/master

setting
SettingDetail