adapt for core 3.2.5 (closes #3439)
correct po conflict (closes #3038)
version 0.6.1 (refs #3439)
add new admin icon (refs #3439)
Merge pull request #2 from Eric-Brison/0.6-A3439

0.6 a3439