Isolate header in an external jsp and include it everywhere.
Merge origin/master