Removed some useless code.
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into read_settings
Merge branch 'development' into read_settings
Restructured 'Settings.xml'. Added injections.
Nothing big.
Merge branch 'development' into read_settings
Added Spring-injections