changes to render jsp
correcting indentation. no functional changes
Merge branches 'master' and 'jsp_render' into jsp_render
Changes to use custom login page