Implement API changes, futher testing
Merge remote-tracking branch 'origin/master'
Update implementation
Update javadocs
Update file status
Merge branch 'master' of https://github.com/TridentSDK/Trident