Merge branch 'develop'
Remove orig
Added new aff pipe
Add link to powered
Merge branch 'master' into develop