refactor Makefiles (closes #3536)
Merge pull request #4 from Eric-Brison/1.0-A3536

refactor Makefiles (closes #3536)
New icon set (refs #3513)
Set admin application label and description (refs #3513)
Typo fixed (refs #3513)