Minor
Major: added template jsp's