Merge pull request #887 from sexnothing/develop

Remove this->bootstrap code in template
Admin login update