SettingDetail
SettingDetail
SettingDetail
SettingDetail
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/file_browser.xml
	res/layout/settingsdetailactivity.xml
	src/cz/vutbr/fit/mogger/SettingsDetailActivity.java
SettingDetail
SettingDetail
Merge pull request #5 from Irteam/master

master