renamed admintemplate
Merging chuy's client home controller
Merge remote-tracking branch 'origin/master'