Merge branch 'master', remote-tracking branch 'origin/master'
Added Administrator interface mock-ups
Merge remote-tracking branch 'origin/master'