Cleaned some redundant code, logic for event colors implemented
Merge branch 'master' of github.com:jonatanl/fellesprosjekt