added admin and client views.
Merging.
Merge remote-tracking branch 'origin/master'