wip
Merge branch '20140718-admin' into 20140717-match
wip