Bug fixes, Changes, ect...
Merge branch 'master' of https://github.com/RBMNT/RBstation2