Merge branch 'master' of D:\Konkurs\SII-humping with conflicts.
Update MessageType.java