completed admin interface
Merge remote-tracking branch 'origin/ideas' into ideas