Many changes
Merge branch 'master' of github.com:Joskinebi/pro