some conficts commented out
Merge branch 'development' of github.com:ohtuprojekti/OKKoPa into development