Merging with remote
Add FloxPlayerTest && PlayerState entity class
Minor bug fixes