removed localheader.jsp
Merge branches 'master' and 'TRUNK-1906'