Resource System implementation ended

merge branches