Removed dodgey bug with min-height with resize
Merge branch 'master' of github.com:cybershade/CSCMS