Fix and upgrade many things#22

Open

Attect wants to merge 22 commits intoYalantis:masterfrom

Commits on Apr 27, 2019

Commits on Apr 29, 2019

change some code with ciscorucinski's suggestions/move resources
Attect
committed