merge with app logic
Merge pull request #3 from castamir/master

merge with app logic
manager
Merge branch 'master' of https://github.com/murrysoft/Mogger-GUI

manager
manager empty
file manager
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