Add index file
Add admin features
Add test for merging
Merge branch 'admin'
Update webwire