Merge pull request #416 from douginator2000/master

updates to wwwadmin