Mega Update

From my live server
Merge branch 'master' of https://github.com/Chomiciak/PufferPanel