init
Merge branch 'master' of github.com:KurlesHS/settingsdialog

Conflicts:
	FileExplorer/project.properties
	implementation/src/com/horrorsoft/viotimer/MyActivity.java
implement json parser.