Merge branch 'master' of /media/A4F1-7AB7/IntelliJProj/Trident with conflicts.
Yus