some server fixes
Merge branch 'master' of https://github.com/mitzimon09/projectsima
Merge branch 'master' of https://github.com/mitzimon09/projectsima
Merge branch 'master' of https://github.com/mitzimon09/projectsima
Merge branch 'master' of https://github.com/mitzimon09/projectsima
Merge branch 'master' of https://github.com/mitzimon09/projectsima
merge
update assets