Merge branch 'master' of /media/A4F1-7AB7/IntelliJProj/Trident/TridentSDK with conflicts.
Merge remote-tracking branch 'origin/master'