add icons
Merge remote-tracking branch 'origin/master'

Conflicts:
	manager/adminpanel.php
ad icons